From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-000718-88; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJV-00070i-Oz for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [193.109.254.147:28216] by server-8.bemta-14.messagelabs.com id 75/5B-01877-8E404B35; Wed, 02 Jul 2014 13:11:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1404306663!10406252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32287 invoked from network); 2 Jul 2014 13:11:04 -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; 2 Jul 2014 13:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJT-0001Dk-5o for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007Bj-3X for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: correct grant page unmapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Juergen Gross # Date 1404305784 -7200 # Node ID 0a5bb80edc458252c0150fbe58c286cf83ad9580 # Parent 0251893a7d5a99e7574e7fd645cc126b2f641103 scsiback: correct grant page unmapping In function scsiback_fast_flush_area() the unmap array is set up with sparse entries in case of some grant pages could not be mapped originally. This can lead to never unmapped grant pages. The unmap array is to be indexed with the so far found number of valid grants, not with the loop variable. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 0251893a7d5a -r 0a5bb80edc45 drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Mon Jun 16 16:11:33 2014 +0200 +++ b/drivers/xen/scsiback/scsiback.c Wed Jul 02 14:56:24 2014 +0200 @@ -92,7 +92,7 @@ void scsiback_fast_flush_area(pending_re handle = pending_handle(req, i); if (handle == SCSIBACK_INVALID_HANDLE) continue; - gnttab_set_unmap_op(&unmap[i], vaddr(req, i), + gnttab_set_unmap_op(&unmap[invcount], vaddr(req, i), GNTMAP_host_map, handle); pending_handle(req, i) = SCSIBACK_INVALID_HANDLE; invcount++; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-00071D-Ae; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJY-00070p-Hs for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [85.158.139.211:37100] by server-17.bemta-5.messagelabs.com id F7/0D-08711-BE404B35; Wed, 02 Jul 2014 13:11:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-206.messagelabs.com!1404306663!13246451!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12942 invoked from network); 2 Jul 2014 13:11:04 -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; 2 Jul 2014 13:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJT-0001Dn-I4 for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007By-GJ for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: fix retry handling in __report_luns() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1404306249 -7200 # Node ID 930d1b2ecc2f6a145a6f95e25db8cb54a366eb69 # Parent 0a5bb80edc458252c0150fbe58c286cf83ad9580 scsiback: fix retry handling in __report_luns() Neither did lun_cnt get reset when invoking a retry here, nor did the intermediate buffer get resized to fit the larger amount. Fix this, at once - adding spare extra buffer space growing with the number of retries, - fix the type of alloc_len (it having been "unsigned char", this set us up for memory corruption), - correct a couple of signed/unsigned issues here and its helper function __nr_luns_under_host(), - remove a couple of pointless initializers, - drop pointless NULL checks before kfree() invocations (not only does kfree() deal fine with NULL, in the first of the two cases it was plain impossible for the pointer to be NULL). Reported-by: Juergen Gross Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross --- diff -r 0a5bb80edc45 -r 930d1b2ecc2f drivers/xen/scsiback/emulate.c --- a/drivers/xen/scsiback/emulate.c Wed Jul 02 14:56:24 2014 +0200 +++ b/drivers/xen/scsiback/emulate.c Wed Jul 02 15:04:09 2014 +0200 @@ -193,12 +193,12 @@ static int __copy_from_sg(struct scatter return 0; } -static int __nr_luns_under_host(struct vscsibk_info *info) +static unsigned int __nr_luns_under_host(struct vscsibk_info *info) { struct v2p_entry *entry; struct list_head *head = &(info->v2p_entry_lists); unsigned long flags; - int lun_cnt = 0; + unsigned int lun_cnt = 0; spin_lock_irqsave(&info->v2p_lock, flags); list_for_each_entry(entry, head, l) { @@ -213,6 +213,7 @@ static int __nr_luns_under_host(struct v /* REPORT LUNS Define*/ #define VSCSI_REPORT_LUNS_HEADER 8 #define VSCSI_REPORT_LUNS_RETRY 3 +#define VSCSI_REPORT_LUNS_SPARE 3 /* quoted scsi_debug.c/resp_report_luns() */ static void __report_luns(pending_req_t *pending_req, void *data) @@ -224,13 +225,11 @@ static void __report_luns(pending_req_t unsigned char *cmd = (unsigned char *)pending_req->cmnd; unsigned char *buff = NULL; - unsigned char alloc_len; - unsigned int alloc_luns = 0; - unsigned int req_bufflen = 0; - unsigned int actual_len = 0; + size_t alloc_len; + unsigned int alloc_luns, req_bufflen, actual_len; unsigned int retry_cnt = 0; - int select_report = (int)cmd[2]; - int i, lun_cnt = 0, lun, upper, err = 0; + int err, select_report = (int)cmd[2]; + unsigned int i, lun_cnt, lun, upper; struct v2p_entry *entry; struct list_head *head = &(info->v2p_entry_lists); @@ -242,16 +241,18 @@ static void __report_luns(pending_req_t if ((req_bufflen < 4) || (select_report != 0)) goto fail; - alloc_luns = __nr_luns_under_host(info); +retry: + alloc_luns = __nr_luns_under_host(info) + + retry_cnt * VSCSI_REPORT_LUNS_SPARE; alloc_len = sizeof(struct scsi_lun) * alloc_luns + VSCSI_REPORT_LUNS_HEADER; -retry: if ((buff = kzalloc(alloc_len, GFP_KERNEL)) == NULL) { printk(KERN_ERR "scsiback:%s kmalloc err\n", __FUNCTION__); goto fail; } - one_lun = (struct scsi_lun *) &buff[8]; + one_lun = (struct scsi_lun *)&buff[VSCSI_REPORT_LUNS_HEADER]; + lun_cnt = 0; spin_lock_irqsave(&info->v2p_lock, flags); list_for_each_entry(entry, head, l) { if ((entry->v.chn == channel) && @@ -264,8 +265,7 @@ retry: if (retry_cnt < VSCSI_REPORT_LUNS_RETRY) { retry_cnt++; - if (buff) - kfree(buff); + kfree(buff); goto retry; } @@ -309,8 +309,7 @@ fail: INVALID_FIELD_IN_CDB, 0); pending_req->rslt = check_condition_result; pending_req->resid = 0; - if (buff) - kfree(buff); + kfree(buff); return; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-00071D-Ae; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJY-00070p-Hs for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [85.158.139.211:37100] by server-17.bemta-5.messagelabs.com id F7/0D-08711-BE404B35; Wed, 02 Jul 2014 13:11:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-206.messagelabs.com!1404306663!13246451!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12942 invoked from network); 2 Jul 2014 13:11:04 -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; 2 Jul 2014 13:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJT-0001Dn-I4 for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007By-GJ for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: fix retry handling in __report_luns() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1404306249 -7200 # Node ID 930d1b2ecc2f6a145a6f95e25db8cb54a366eb69 # Parent 0a5bb80edc458252c0150fbe58c286cf83ad9580 scsiback: fix retry handling in __report_luns() Neither did lun_cnt get reset when invoking a retry here, nor did the intermediate buffer get resized to fit the larger amount. Fix this, at once - adding spare extra buffer space growing with the number of retries, - fix the type of alloc_len (it having been "unsigned char", this set us up for memory corruption), - correct a couple of signed/unsigned issues here and its helper function __nr_luns_under_host(), - remove a couple of pointless initializers, - drop pointless NULL checks before kfree() invocations (not only does kfree() deal fine with NULL, in the first of the two cases it was plain impossible for the pointer to be NULL). Reported-by: Juergen Gross Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross --- diff -r 0a5bb80edc45 -r 930d1b2ecc2f drivers/xen/scsiback/emulate.c --- a/drivers/xen/scsiback/emulate.c Wed Jul 02 14:56:24 2014 +0200 +++ b/drivers/xen/scsiback/emulate.c Wed Jul 02 15:04:09 2014 +0200 @@ -193,12 +193,12 @@ static int __copy_from_sg(struct scatter return 0; } -static int __nr_luns_under_host(struct vscsibk_info *info) +static unsigned int __nr_luns_under_host(struct vscsibk_info *info) { struct v2p_entry *entry; struct list_head *head = &(info->v2p_entry_lists); unsigned long flags; - int lun_cnt = 0; + unsigned int lun_cnt = 0; spin_lock_irqsave(&info->v2p_lock, flags); list_for_each_entry(entry, head, l) { @@ -213,6 +213,7 @@ static int __nr_luns_under_host(struct v /* REPORT LUNS Define*/ #define VSCSI_REPORT_LUNS_HEADER 8 #define VSCSI_REPORT_LUNS_RETRY 3 +#define VSCSI_REPORT_LUNS_SPARE 3 /* quoted scsi_debug.c/resp_report_luns() */ static void __report_luns(pending_req_t *pending_req, void *data) @@ -224,13 +225,11 @@ static void __report_luns(pending_req_t unsigned char *cmd = (unsigned char *)pending_req->cmnd; unsigned char *buff = NULL; - unsigned char alloc_len; - unsigned int alloc_luns = 0; - unsigned int req_bufflen = 0; - unsigned int actual_len = 0; + size_t alloc_len; + unsigned int alloc_luns, req_bufflen, actual_len; unsigned int retry_cnt = 0; - int select_report = (int)cmd[2]; - int i, lun_cnt = 0, lun, upper, err = 0; + int err, select_report = (int)cmd[2]; + unsigned int i, lun_cnt, lun, upper; struct v2p_entry *entry; struct list_head *head = &(info->v2p_entry_lists); @@ -242,16 +241,18 @@ static void __report_luns(pending_req_t if ((req_bufflen < 4) || (select_report != 0)) goto fail; - alloc_luns = __nr_luns_under_host(info); +retry: + alloc_luns = __nr_luns_under_host(info) + + retry_cnt * VSCSI_REPORT_LUNS_SPARE; alloc_len = sizeof(struct scsi_lun) * alloc_luns + VSCSI_REPORT_LUNS_HEADER; -retry: if ((buff = kzalloc(alloc_len, GFP_KERNEL)) == NULL) { printk(KERN_ERR "scsiback:%s kmalloc err\n", __FUNCTION__); goto fail; } - one_lun = (struct scsi_lun *) &buff[8]; + one_lun = (struct scsi_lun *)&buff[VSCSI_REPORT_LUNS_HEADER]; + lun_cnt = 0; spin_lock_irqsave(&info->v2p_lock, flags); list_for_each_entry(entry, head, l) { if ((entry->v.chn == channel) && @@ -264,8 +265,7 @@ retry: if (retry_cnt < VSCSI_REPORT_LUNS_RETRY) { retry_cnt++; - if (buff) - kfree(buff); + kfree(buff); goto retry; } @@ -309,8 +309,7 @@ fail: INVALID_FIELD_IN_CDB, 0); pending_req->rslt = check_condition_result; pending_req->resid = 0; - if (buff) - kfree(buff); + kfree(buff); return; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-00071I-Co; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJW-00070o-Ca for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [85.158.137.68:10549] by server-11.bemta-3.messagelabs.com id 61/9C-12889-9E404B35; Wed, 02 Jul 2014 13:11:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-31.messagelabs.com!1404306664!13654108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 949 invoked from network); 2 Jul 2014 13:11:05 -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; 2 Jul 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 1X2KJT-0001Dq-Sy for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007CD-Rl for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: drop pointless initializer from smp_trap_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 # HG changeset patch # User Jan Beulich # Date 1404306558 -7200 # Node ID 19448506c371bd071312f55055e81043fc4a4e78 # Parent 930d1b2ecc2f6a145a6f95e25db8cb54a366eb69 x86: drop pointless initializer from smp_trap_init() Signed-off-by: Jan Beulich --- diff -r 930d1b2ecc2f -r 19448506c371 arch/i386/kernel/traps-xen.c --- a/arch/i386/kernel/traps-xen.c Wed Jul 02 15:04:09 2014 +0200 +++ b/arch/i386/kernel/traps-xen.c Wed Jul 02 15:09:18 2014 +0200 @@ -1158,7 +1158,7 @@ void __init trap_init(void) void __cpuinit smp_trap_init(trap_info_t *trap_ctxt) { - const trap_info_t *t = trap_table; + const trap_info_t *t; for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; diff -r 930d1b2ecc2f -r 19448506c371 arch/x86_64/kernel/traps-xen.c --- a/arch/x86_64/kernel/traps-xen.c Wed Jul 02 15:04:09 2014 +0200 +++ b/arch/x86_64/kernel/traps-xen.c Wed Jul 02 15:09:18 2014 +0200 @@ -1132,7 +1132,7 @@ void __init trap_init(void) void __cpuinit smp_trap_init(trap_info_t *trap_ctxt) { - const trap_info_t *t = trap_table; + const trap_info_t *t; for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-000718-88; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJV-00070i-Oz for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [193.109.254.147:28216] by server-8.bemta-14.messagelabs.com id 75/5B-01877-8E404B35; Wed, 02 Jul 2014 13:11:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1404306663!10406252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32287 invoked from network); 2 Jul 2014 13:11:04 -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; 2 Jul 2014 13:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJT-0001Dk-5o for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007Bj-3X for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: correct grant page unmapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Juergen Gross # Date 1404305784 -7200 # Node ID 0a5bb80edc458252c0150fbe58c286cf83ad9580 # Parent 0251893a7d5a99e7574e7fd645cc126b2f641103 scsiback: correct grant page unmapping In function scsiback_fast_flush_area() the unmap array is set up with sparse entries in case of some grant pages could not be mapped originally. This can lead to never unmapped grant pages. The unmap array is to be indexed with the so far found number of valid grants, not with the loop variable. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 0251893a7d5a -r 0a5bb80edc45 drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Mon Jun 16 16:11:33 2014 +0200 +++ b/drivers/xen/scsiback/scsiback.c Wed Jul 02 14:56:24 2014 +0200 @@ -92,7 +92,7 @@ void scsiback_fast_flush_area(pending_re handle = pending_handle(req, i); if (handle == SCSIBACK_INVALID_HANDLE) continue; - gnttab_set_unmap_op(&unmap[i], vaddr(req, i), + gnttab_set_unmap_op(&unmap[invcount], vaddr(req, i), GNTMAP_host_map, handle); pending_handle(req, i) = SCSIBACK_INVALID_HANDLE; invcount++; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 13:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 13:11: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 1X2KJa-00071I-Co; Wed, 02 Jul 2014 13:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KJW-00070o-Ca for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:09 +0000 Received: from [85.158.137.68:10549] by server-11.bemta-3.messagelabs.com id 61/9C-12889-9E404B35; Wed, 02 Jul 2014 13:11:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-31.messagelabs.com!1404306664!13654108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 949 invoked from network); 2 Jul 2014 13:11:05 -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; 2 Jul 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 1X2KJT-0001Dq-Sy for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2KJT-0007CD-Rl for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 13:11:03 +0000 Message-Id: Date: Wed, 02 Jul 2014 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: drop pointless initializer from smp_trap_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 # HG changeset patch # User Jan Beulich # Date 1404306558 -7200 # Node ID 19448506c371bd071312f55055e81043fc4a4e78 # Parent 930d1b2ecc2f6a145a6f95e25db8cb54a366eb69 x86: drop pointless initializer from smp_trap_init() Signed-off-by: Jan Beulich --- diff -r 930d1b2ecc2f -r 19448506c371 arch/i386/kernel/traps-xen.c --- a/arch/i386/kernel/traps-xen.c Wed Jul 02 15:04:09 2014 +0200 +++ b/arch/i386/kernel/traps-xen.c Wed Jul 02 15:09:18 2014 +0200 @@ -1158,7 +1158,7 @@ void __init trap_init(void) void __cpuinit smp_trap_init(trap_info_t *trap_ctxt) { - const trap_info_t *t = trap_table; + const trap_info_t *t; for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; diff -r 930d1b2ecc2f -r 19448506c371 arch/x86_64/kernel/traps-xen.c --- a/arch/x86_64/kernel/traps-xen.c Wed Jul 02 15:04:09 2014 +0200 +++ b/arch/x86_64/kernel/traps-xen.c Wed Jul 02 15:09:18 2014 +0200 @@ -1132,7 +1132,7 @@ void __init trap_init(void) void __cpuinit smp_trap_init(trap_info_t *trap_ctxt) { - const trap_info_t *t = trap_table; + const trap_info_t *t; for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 15:11:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 15:11: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 1X2MBe-0003qL-M4; Wed, 02 Jul 2014 15:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBd-0003pW-HJ for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:05 +0000 Received: from [85.158.139.211:2677] by server-7.bemta-5.messagelabs.com id 9D/22-03657-80124B35; Wed, 02 Jul 2014 15:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404313863!7885974!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13368 invoked from network); 2 Jul 2014 15:11:04 -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; 2 Jul 2014 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBa-0002U5-TS for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2MBa-0005OE-My for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:02 +0000 Date: Wed, 02 Jul 2014 15:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] qemu-xen-trad: free all the pirqs for msi/msix when driver unloads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a7abb1694f22cb18616ee7a7a544b026c914bf9 Author: Zhenzhong Duan AuthorDate: Tue Apr 8 16:50:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Jul 2 15:54:45 2014 +0100 qemu-xen-trad: free all the pirqs for msi/msix when driver unloads Pirqs are not freed when driver unloads, then new pirqs are allocated when driver reloads. This could exhaust pirqs if do it in a loop. This patch fixes the bug by freeing pirqs when ENABLE bit is cleared in msi/msix control reg. There is also other way of fixing it such as reuse pirqs between driver reload, but this way is better. Xen-devel: http://marc.info/?l=xen-devel&m=136800120304275&w=2 Signed-off-by: Zhenzhong Duan Signed-off-by: Konrad Rzeszutek Wilk [ This is the qemu-xen-trad version of qemu-xen-upstream 1d4fd4f0e2fc5dcae0c60e00cc9af95f52988050 -iwj ] (cherry picked from commit d0395cc49b2ec6d1723c01f1daf2394b9264ca29) (cherry picked from commit 6ae4e588081620b141071eb010ec40aca7e12876) --- hw/pass-through.c | 8 +++++++- hw/pt-msi.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..4821182 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3866,7 +3866,11 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, ptdev->msi->flags |= PCI_MSI_FLAGS_ENABLE; } else - ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; + { + if (ptdev->msi->flags & PT_MSI_MAPPED) { + pt_msi_disable(ptdev); + } + } /* pass through MSI_ENABLE bit when no MSI-INTx translation */ if (!ptdev->msi_trans_en) { @@ -4013,6 +4017,8 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, pt_disable_msi_translate(ptdev); } pt_msix_update(ptdev); + } else if (!(*value & PCI_MSIX_ENABLE) && ptdev->msix->enabled) { + pt_msix_disable(ptdev); } ptdev->msix->enabled = !!(*value & PCI_MSIX_ENABLE); diff --git a/hw/pt-msi.c b/hw/pt-msi.c index b03b989..3f5f94b 100644 --- a/hw/pt-msi.c +++ b/hw/pt-msi.c @@ -213,7 +213,8 @@ void pt_msi_disable(struct pt_dev *dev) out: /* clear msi info */ - dev->msi->flags &= ~(MSI_FLAG_UNINIT | PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags &= ~(PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags |= MSI_FLAG_UNINIT; dev->msi->pirq = -1; dev->msi_trans_en = 0; } @@ -447,7 +448,7 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { const volatile uint32_t *vec_ctrl; - if ( entry->io_mem[offset] == val ) + if ( entry->io_mem[offset] == val && entry->pirq != -1) return; /* -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 15:11:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 15:11: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 1X2MBe-0003qL-M4; Wed, 02 Jul 2014 15:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBd-0003pW-HJ for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:05 +0000 Received: from [85.158.139.211:2677] by server-7.bemta-5.messagelabs.com id 9D/22-03657-80124B35; Wed, 02 Jul 2014 15:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404313863!7885974!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13368 invoked from network); 2 Jul 2014 15:11:04 -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; 2 Jul 2014 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBa-0002U5-TS for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2MBa-0005OE-My for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:02 +0000 Date: Wed, 02 Jul 2014 15:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] qemu-xen-trad: free all the pirqs for msi/msix when driver unloads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a7abb1694f22cb18616ee7a7a544b026c914bf9 Author: Zhenzhong Duan AuthorDate: Tue Apr 8 16:50:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Jul 2 15:54:45 2014 +0100 qemu-xen-trad: free all the pirqs for msi/msix when driver unloads Pirqs are not freed when driver unloads, then new pirqs are allocated when driver reloads. This could exhaust pirqs if do it in a loop. This patch fixes the bug by freeing pirqs when ENABLE bit is cleared in msi/msix control reg. There is also other way of fixing it such as reuse pirqs between driver reload, but this way is better. Xen-devel: http://marc.info/?l=xen-devel&m=136800120304275&w=2 Signed-off-by: Zhenzhong Duan Signed-off-by: Konrad Rzeszutek Wilk [ This is the qemu-xen-trad version of qemu-xen-upstream 1d4fd4f0e2fc5dcae0c60e00cc9af95f52988050 -iwj ] (cherry picked from commit d0395cc49b2ec6d1723c01f1daf2394b9264ca29) (cherry picked from commit 6ae4e588081620b141071eb010ec40aca7e12876) --- hw/pass-through.c | 8 +++++++- hw/pt-msi.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..4821182 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3866,7 +3866,11 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, ptdev->msi->flags |= PCI_MSI_FLAGS_ENABLE; } else - ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; + { + if (ptdev->msi->flags & PT_MSI_MAPPED) { + pt_msi_disable(ptdev); + } + } /* pass through MSI_ENABLE bit when no MSI-INTx translation */ if (!ptdev->msi_trans_en) { @@ -4013,6 +4017,8 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, pt_disable_msi_translate(ptdev); } pt_msix_update(ptdev); + } else if (!(*value & PCI_MSIX_ENABLE) && ptdev->msix->enabled) { + pt_msix_disable(ptdev); } ptdev->msix->enabled = !!(*value & PCI_MSIX_ENABLE); diff --git a/hw/pt-msi.c b/hw/pt-msi.c index b03b989..3f5f94b 100644 --- a/hw/pt-msi.c +++ b/hw/pt-msi.c @@ -213,7 +213,8 @@ void pt_msi_disable(struct pt_dev *dev) out: /* clear msi info */ - dev->msi->flags &= ~(MSI_FLAG_UNINIT | PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags &= ~(PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags |= MSI_FLAG_UNINIT; dev->msi->pirq = -1; dev->msi_trans_en = 0; } @@ -447,7 +448,7 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { const volatile uint32_t *vec_ctrl; - if ( entry->io_mem[offset] == val ) + if ( entry->io_mem[offset] == val && entry->pirq != -1) return; /* -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 15:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 15:11: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 1X2MBp-0003v0-Ov; Wed, 02 Jul 2014 15:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBo-0003uI-Cf for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:16 +0000 Received: from [85.158.143.35:22605] by server-1.bemta-4.messagelabs.com id 54/C9-09496-31124B35; Wed, 02 Jul 2014 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404313874!7356317!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13686 invoked from network); 2 Jul 2014 15:11:14 -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; 2 Jul 2014 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBl-0002UB-SR for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2MBl-0005Ou-QS for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:13 +0000 Date: Wed, 02 Jul 2014 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] qemu-xen-trad: free all the pirqs for msi/msix when driver unloads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ae4e588081620b141071eb010ec40aca7e12876 Author: Zhenzhong Duan AuthorDate: Tue Apr 8 16:50:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Jul 2 15:54:37 2014 +0100 qemu-xen-trad: free all the pirqs for msi/msix when driver unloads Pirqs are not freed when driver unloads, then new pirqs are allocated when driver reloads. This could exhaust pirqs if do it in a loop. This patch fixes the bug by freeing pirqs when ENABLE bit is cleared in msi/msix control reg. There is also other way of fixing it such as reuse pirqs between driver reload, but this way is better. Xen-devel: http://marc.info/?l=xen-devel&m=136800120304275&w=2 Signed-off-by: Zhenzhong Duan Signed-off-by: Konrad Rzeszutek Wilk [ This is the qemu-xen-trad version of qemu-xen-upstream 1d4fd4f0e2fc5dcae0c60e00cc9af95f52988050 -iwj ] (cherry picked from commit d0395cc49b2ec6d1723c01f1daf2394b9264ca29) --- hw/pass-through.c | 8 +++++++- hw/pt-msi.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..4821182 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3866,7 +3866,11 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, ptdev->msi->flags |= PCI_MSI_FLAGS_ENABLE; } else - ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; + { + if (ptdev->msi->flags & PT_MSI_MAPPED) { + pt_msi_disable(ptdev); + } + } /* pass through MSI_ENABLE bit when no MSI-INTx translation */ if (!ptdev->msi_trans_en) { @@ -4013,6 +4017,8 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, pt_disable_msi_translate(ptdev); } pt_msix_update(ptdev); + } else if (!(*value & PCI_MSIX_ENABLE) && ptdev->msix->enabled) { + pt_msix_disable(ptdev); } ptdev->msix->enabled = !!(*value & PCI_MSIX_ENABLE); diff --git a/hw/pt-msi.c b/hw/pt-msi.c index b03b989..3f5f94b 100644 --- a/hw/pt-msi.c +++ b/hw/pt-msi.c @@ -213,7 +213,8 @@ void pt_msi_disable(struct pt_dev *dev) out: /* clear msi info */ - dev->msi->flags &= ~(MSI_FLAG_UNINIT | PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags &= ~(PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags |= MSI_FLAG_UNINIT; dev->msi->pirq = -1; dev->msi_trans_en = 0; } @@ -447,7 +448,7 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { const volatile uint32_t *vec_ctrl; - if ( entry->io_mem[offset] == val ) + if ( entry->io_mem[offset] == val && entry->pirq != -1) return; /* -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 02 15:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 02 Jul 2014 15:11: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 1X2MBp-0003v0-Ov; Wed, 02 Jul 2014 15:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBo-0003uI-Cf for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:16 +0000 Received: from [85.158.143.35:22605] by server-1.bemta-4.messagelabs.com id 54/C9-09496-31124B35; Wed, 02 Jul 2014 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404313874!7356317!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13686 invoked from network); 2 Jul 2014 15:11:14 -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; 2 Jul 2014 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2MBl-0002UB-SR for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X2MBl-0005Ou-QS for xen-changelog@lists.xensource.com; Wed, 02 Jul 2014 15:11:13 +0000 Date: Wed, 02 Jul 2014 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] qemu-xen-trad: free all the pirqs for msi/msix when driver unloads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ae4e588081620b141071eb010ec40aca7e12876 Author: Zhenzhong Duan AuthorDate: Tue Apr 8 16:50:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Jul 2 15:54:37 2014 +0100 qemu-xen-trad: free all the pirqs for msi/msix when driver unloads Pirqs are not freed when driver unloads, then new pirqs are allocated when driver reloads. This could exhaust pirqs if do it in a loop. This patch fixes the bug by freeing pirqs when ENABLE bit is cleared in msi/msix control reg. There is also other way of fixing it such as reuse pirqs between driver reload, but this way is better. Xen-devel: http://marc.info/?l=xen-devel&m=136800120304275&w=2 Signed-off-by: Zhenzhong Duan Signed-off-by: Konrad Rzeszutek Wilk [ This is the qemu-xen-trad version of qemu-xen-upstream 1d4fd4f0e2fc5dcae0c60e00cc9af95f52988050 -iwj ] (cherry picked from commit d0395cc49b2ec6d1723c01f1daf2394b9264ca29) --- hw/pass-through.c | 8 +++++++- hw/pt-msi.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..4821182 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3866,7 +3866,11 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, ptdev->msi->flags |= PCI_MSI_FLAGS_ENABLE; } else - ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; + { + if (ptdev->msi->flags & PT_MSI_MAPPED) { + pt_msi_disable(ptdev); + } + } /* pass through MSI_ENABLE bit when no MSI-INTx translation */ if (!ptdev->msi_trans_en) { @@ -4013,6 +4017,8 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, pt_disable_msi_translate(ptdev); } pt_msix_update(ptdev); + } else if (!(*value & PCI_MSIX_ENABLE) && ptdev->msix->enabled) { + pt_msix_disable(ptdev); } ptdev->msix->enabled = !!(*value & PCI_MSIX_ENABLE); diff --git a/hw/pt-msi.c b/hw/pt-msi.c index b03b989..3f5f94b 100644 --- a/hw/pt-msi.c +++ b/hw/pt-msi.c @@ -213,7 +213,8 @@ void pt_msi_disable(struct pt_dev *dev) out: /* clear msi info */ - dev->msi->flags &= ~(MSI_FLAG_UNINIT | PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags &= ~(PT_MSI_MAPPED | PCI_MSI_FLAGS_ENABLE); + dev->msi->flags |= MSI_FLAG_UNINIT; dev->msi->pirq = -1; dev->msi_trans_en = 0; } @@ -447,7 +448,7 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { const volatile uint32_t *vec_ctrl; - if ( entry->io_mem[offset] == val ) + if ( entry->io_mem[offset] == val && entry->pirq != -1) return; /* -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 04 10:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Jul 2014 10:22: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 1X30d6-0004RV-4d; Fri, 04 Jul 2014 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X30d4-0004RG-GL for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:06 +0000 Received: from [193.109.254.147:17210] by server-9.bemta-14.messagelabs.com id 51/BA-14237-D4086B35; Fri, 04 Jul 2014 10:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1404469324!15408011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12804 invoked from network); 4 Jul 2014 10:22:04 -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; 4 Jul 2014 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X30d1-0003SR-QV for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X30d1-0006Yf-Mm for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:03 +0000 Message-Id: Date: Fri, 04 Jul 2014 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: free resources after 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 # HG changeset patch # User Juergen Gross # Date 1404468622 -7200 # Node ID ca51c3ea6ffd43202ba0435f2cdb012e28cae09e # Parent 19448506c371bd071312f55055e81043fc4a4e78 scsiback: free resources after error In case of an error during preparing an I/O the already allocated resources should all be freed again and the frontend request should be terminated accordingly. Signed-off-by: Juergen Gross Some formatting adjustments to the changes above, and some more releasing of resources (in the VSCSIIF_ACT_SCSI_RESET and default cases of the switch in scsiback_do_cmd_fn()). Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/common.h --- a/drivers/xen/scsiback/common.h Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/common.h Fri Jul 04 12:10:22 2014 +0200 @@ -163,13 +163,13 @@ struct scsi_device *scsiback_do_translat void scsiback_release_translation_entry(struct vscsibk_info *info); -void scsiback_cmd_exec(pending_req_t *pending_req); +int scsiback_cmd_exec(pending_req_t *pending_req); void scsiback_do_resp_with_sense(char *sense_buffer, int32_t result, uint32_t resid, pending_req_t *pending_req); void scsiback_fast_flush_area(pending_req_t *req); void scsiback_rsp_emulation(pending_req_t *pending_req); -void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req); +int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req); void scsiback_emulation_init(void); diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/emulate.c --- a/drivers/xen/scsiback/emulate.c Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/emulate.c Fri Jul 04 12:10:22 2014 +0200 @@ -345,16 +345,16 @@ void scsiback_rsp_emulation(pending_req_ } -void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req) +int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req) { - if (__pre_do_emulation(pending_req, NULL)) { - scsiback_cmd_exec(pending_req); - } - else { - scsiback_fast_flush_area(pending_req); - scsiback_do_resp_with_sense(pending_req->sense_buffer, - pending_req->rslt, pending_req->resid, pending_req); - } + if (__pre_do_emulation(pending_req, NULL)) + return scsiback_cmd_exec(pending_req); + + scsiback_fast_flush_area(pending_req); + scsiback_do_resp_with_sense(pending_req->sense_buffer, + pending_req->rslt, pending_req->resid, + pending_req); + return 0; } diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/scsiback.c Fri Jul 04 12:10:22 2014 +0200 @@ -429,14 +429,14 @@ free_bios: } -void scsiback_cmd_exec(pending_req_t *pending_req) +int scsiback_cmd_exec(pending_req_t *pending_req) { int cmd_len = (int)pending_req->cmd_len; int data_dir = (int)pending_req->sc_data_direction; unsigned int nr_segments = (unsigned int)pending_req->nr_segments; unsigned int timeout; struct request *rq; - int write; + int write, err; DPRINTK("%s\n",__FUNCTION__); @@ -463,17 +463,19 @@ void scsiback_cmd_exec(pending_req_t *pe rq->end_io_data = pending_req; if (nr_segments) { - - if (request_map_sg(rq, pending_req, nr_segments)) { - printk(KERN_ERR "scsiback: SG Request Map Error\n"); - return; + err = request_map_sg(rq, pending_req, nr_segments); + if (err) { + printk(KERN_ERR "scsiback: SG Request Map error %d\n", + err); + blk_put_request(rq); + return err; } } scsiback_get(pending_req->info); blk_execute_rq_nowait(rq->q, NULL, rq, 1, scsiback_cmd_done); - return ; + return 0; } @@ -615,17 +617,28 @@ static int _scsiback_do_cmd_fn(struct vs switch (err ?: pending_req->act) { case VSCSIIF_ACT_SCSI_CDB: /* The Host mode is through as for Emulation. */ - if (info->feature == VSCSI_TYPE_HOST) - scsiback_cmd_exec(pending_req); - else - scsiback_req_emulation_or_cmdexec(pending_req); + if (info->feature == VSCSI_TYPE_HOST ? + scsiback_cmd_exec(pending_req) : + scsiback_req_emulation_or_cmdexec(pending_req)) { + scsiback_fast_flush_area(pending_req); + scsiback_do_resp_with_sense(NULL, + DRIVER_ERROR << 24, + 0, pending_req); + } break; case VSCSIIF_ACT_SCSI_RESET: + /* Just for pointlessly specified segments: */ + scsiback_fast_flush_area(pending_req); scsiback_device_reset_exec(pending_req); break; default: - if(!err && printk_ratelimit()) - printk(KERN_ERR "scsiback: invalid request\n"); + if(!err) { + scsiback_fast_flush_area(pending_req); + if (printk_ratelimit()) + printk(KERN_ERR + "scsiback: invalid request %#x\n", + pending_req->act); + } scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24, 0, pending_req); break; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 04 10:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Jul 2014 10:22: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 1X30d6-0004RV-4d; Fri, 04 Jul 2014 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X30d4-0004RG-GL for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:06 +0000 Received: from [193.109.254.147:17210] by server-9.bemta-14.messagelabs.com id 51/BA-14237-D4086B35; Fri, 04 Jul 2014 10:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1404469324!15408011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12804 invoked from network); 4 Jul 2014 10:22:04 -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; 4 Jul 2014 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X30d1-0003SR-QV for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X30d1-0006Yf-Mm for xen-changelog@lists.xensource.com; Fri, 04 Jul 2014 10:22:03 +0000 Message-Id: Date: Fri, 04 Jul 2014 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsiback: free resources after 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 # HG changeset patch # User Juergen Gross # Date 1404468622 -7200 # Node ID ca51c3ea6ffd43202ba0435f2cdb012e28cae09e # Parent 19448506c371bd071312f55055e81043fc4a4e78 scsiback: free resources after error In case of an error during preparing an I/O the already allocated resources should all be freed again and the frontend request should be terminated accordingly. Signed-off-by: Juergen Gross Some formatting adjustments to the changes above, and some more releasing of resources (in the VSCSIIF_ACT_SCSI_RESET and default cases of the switch in scsiback_do_cmd_fn()). Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/common.h --- a/drivers/xen/scsiback/common.h Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/common.h Fri Jul 04 12:10:22 2014 +0200 @@ -163,13 +163,13 @@ struct scsi_device *scsiback_do_translat void scsiback_release_translation_entry(struct vscsibk_info *info); -void scsiback_cmd_exec(pending_req_t *pending_req); +int scsiback_cmd_exec(pending_req_t *pending_req); void scsiback_do_resp_with_sense(char *sense_buffer, int32_t result, uint32_t resid, pending_req_t *pending_req); void scsiback_fast_flush_area(pending_req_t *req); void scsiback_rsp_emulation(pending_req_t *pending_req); -void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req); +int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req); void scsiback_emulation_init(void); diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/emulate.c --- a/drivers/xen/scsiback/emulate.c Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/emulate.c Fri Jul 04 12:10:22 2014 +0200 @@ -345,16 +345,16 @@ void scsiback_rsp_emulation(pending_req_ } -void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req) +int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req) { - if (__pre_do_emulation(pending_req, NULL)) { - scsiback_cmd_exec(pending_req); - } - else { - scsiback_fast_flush_area(pending_req); - scsiback_do_resp_with_sense(pending_req->sense_buffer, - pending_req->rslt, pending_req->resid, pending_req); - } + if (__pre_do_emulation(pending_req, NULL)) + return scsiback_cmd_exec(pending_req); + + scsiback_fast_flush_area(pending_req); + scsiback_do_resp_with_sense(pending_req->sense_buffer, + pending_req->rslt, pending_req->resid, + pending_req); + return 0; } diff -r 19448506c371 -r ca51c3ea6ffd drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Wed Jul 02 15:09:18 2014 +0200 +++ b/drivers/xen/scsiback/scsiback.c Fri Jul 04 12:10:22 2014 +0200 @@ -429,14 +429,14 @@ free_bios: } -void scsiback_cmd_exec(pending_req_t *pending_req) +int scsiback_cmd_exec(pending_req_t *pending_req) { int cmd_len = (int)pending_req->cmd_len; int data_dir = (int)pending_req->sc_data_direction; unsigned int nr_segments = (unsigned int)pending_req->nr_segments; unsigned int timeout; struct request *rq; - int write; + int write, err; DPRINTK("%s\n",__FUNCTION__); @@ -463,17 +463,19 @@ void scsiback_cmd_exec(pending_req_t *pe rq->end_io_data = pending_req; if (nr_segments) { - - if (request_map_sg(rq, pending_req, nr_segments)) { - printk(KERN_ERR "scsiback: SG Request Map Error\n"); - return; + err = request_map_sg(rq, pending_req, nr_segments); + if (err) { + printk(KERN_ERR "scsiback: SG Request Map error %d\n", + err); + blk_put_request(rq); + return err; } } scsiback_get(pending_req->info); blk_execute_rq_nowait(rq->q, NULL, rq, 1, scsiback_cmd_done); - return ; + return 0; } @@ -615,17 +617,28 @@ static int _scsiback_do_cmd_fn(struct vs switch (err ?: pending_req->act) { case VSCSIIF_ACT_SCSI_CDB: /* The Host mode is through as for Emulation. */ - if (info->feature == VSCSI_TYPE_HOST) - scsiback_cmd_exec(pending_req); - else - scsiback_req_emulation_or_cmdexec(pending_req); + if (info->feature == VSCSI_TYPE_HOST ? + scsiback_cmd_exec(pending_req) : + scsiback_req_emulation_or_cmdexec(pending_req)) { + scsiback_fast_flush_area(pending_req); + scsiback_do_resp_with_sense(NULL, + DRIVER_ERROR << 24, + 0, pending_req); + } break; case VSCSIIF_ACT_SCSI_RESET: + /* Just for pointlessly specified segments: */ + scsiback_fast_flush_area(pending_req); scsiback_device_reset_exec(pending_req); break; default: - if(!err && printk_ratelimit()) - printk(KERN_ERR "scsiback: invalid request\n"); + if(!err) { + scsiback_fast_flush_area(pending_req); + if (printk_ratelimit()) + printk(KERN_ERR + "scsiback: invalid request %#x\n", + pending_req->act); + } scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24, 0, pending_req); break; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 05 00:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 00:11: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 1X3DZN-00051R-UA; Sat, 05 Jul 2014 00:11:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3DZM-00051J-BX for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:08 +0000 Received: from [85.158.139.211:9434] by server-10.bemta-5.messagelabs.com id 86/61-10247-B9247B35; Sat, 05 Jul 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1404519065!10854666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22805 invoked from network); 5 Jul 2014 00:11: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; 5 Jul 2014 00:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3DZG-0004lh-KP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3DZG-00071K-Cg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:02 +0000 Date: Sat, 05 Jul 2014 00:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] blktap2: Fix two 'maybe uninitialized' 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 c971b9f61f5b143dd36d8afc322d1b0bedbbb1a7 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:40 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) (cherry picked from commit 5e39eb05aa2a6d9bfa6c3b3e299b071422498625) (cherry picked from commit c591613f8c629f18a521269d67240d532f2c27d1) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 00:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 00:11: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 1X3DZN-00051R-UA; Sat, 05 Jul 2014 00:11:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3DZM-00051J-BX for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:08 +0000 Received: from [85.158.139.211:9434] by server-10.bemta-5.messagelabs.com id 86/61-10247-B9247B35; Sat, 05 Jul 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1404519065!10854666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22805 invoked from network); 5 Jul 2014 00:11: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; 5 Jul 2014 00:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3DZG-0004lh-KP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3DZG-00071K-Cg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 00:11:02 +0000 Date: Sat, 05 Jul 2014 00:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] blktap2: Fix two 'maybe uninitialized' 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 c971b9f61f5b143dd36d8afc322d1b0bedbbb1a7 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:40 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) (cherry picked from commit 5e39eb05aa2a6d9bfa6c3b3e299b071422498625) (cherry picked from commit c591613f8c629f18a521269d67240d532f2c27d1) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 06:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:44: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 1X3Jhf-0006H1-CV; Sat, 05 Jul 2014 06:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jhe-0006Gu-BQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:06 +0000 Received: from [85.158.143.35:17317] by server-3.bemta-4.messagelabs.com id E8/DE-16194-5BE97B35; Sat, 05 Jul 2014 06:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1404542644!16043957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17813 invoked from network); 5 Jul 2014 06:44:05 -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; 5 Jul 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 1X3Jhb-0007Yp-Sk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhb-0001OL-KJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:03 +0000 Date: Sat, 05 Jul 2014 06:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Panic when we receive an unexpected trap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0424674f3fa98b7792c838725fbf5623258698b1 Author: Julien Grall AuthorDate: Tue Jun 17 21:44:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:37:00 2014 +0100 xen/arm: Panic when we receive an unexpected trap The current implementation of do_unexpected_trap make Xen spin forever on the current physical CPU. This may lead to stall guests VCPU and print unhelpful message (RCU stall...). Usually when Xen receives an unexpected trap, it means that something goes wrong either in the hypervisor or in the CPU. In this case we should directly panic to also stop the other CPUs. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 4f5ab681d208993f94553203f4be323b3c929070) --- 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 377f18f..1498ea0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -999,7 +999,7 @@ void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs) { printk("CPU%d: Unexpected Trap: %s\n", smp_processor_id(), msg); show_execution_state(regs); - while(1); + panic("CPU%d: Unexpected Trap: %s\n", smp_processor_id(), msg); } typedef register_t (*arm_hypercall_fn_t)( -- 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 Jul 05 06:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:44: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 1X3Jhf-0006H1-CV; Sat, 05 Jul 2014 06:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jhe-0006Gu-BQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:06 +0000 Received: from [85.158.143.35:17317] by server-3.bemta-4.messagelabs.com id E8/DE-16194-5BE97B35; Sat, 05 Jul 2014 06:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1404542644!16043957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17813 invoked from network); 5 Jul 2014 06:44:05 -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; 5 Jul 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 1X3Jhb-0007Yp-Sk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhb-0001OL-KJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:03 +0000 Date: Sat, 05 Jul 2014 06:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Panic when we receive an unexpected trap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0424674f3fa98b7792c838725fbf5623258698b1 Author: Julien Grall AuthorDate: Tue Jun 17 21:44:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:37:00 2014 +0100 xen/arm: Panic when we receive an unexpected trap The current implementation of do_unexpected_trap make Xen spin forever on the current physical CPU. This may lead to stall guests VCPU and print unhelpful message (RCU stall...). Usually when Xen receives an unexpected trap, it means that something goes wrong either in the hypervisor or in the CPU. In this case we should directly panic to also stop the other CPUs. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 4f5ab681d208993f94553203f4be323b3c929070) --- 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 377f18f..1498ea0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -999,7 +999,7 @@ void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs) { printk("CPU%d: Unexpected Trap: %s\n", smp_processor_id(), msg); show_execution_state(regs); - while(1); + panic("CPU%d: Unexpected Trap: %s\n", smp_processor_id(), msg); } typedef register_t (*arm_hypercall_fn_t)( -- 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 Jul 05 06:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3Jhq-0006I9-FA; Sat, 05 Jul 2014 06: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 1X3Jho-0006Hz-Sa for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:17 +0000 Received: from [85.158.137.68:2465] by server-12.bemta-3.messagelabs.com id 93/EF-12714-0CE97B35; Sat, 05 Jul 2014 06:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404542654!14229517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8062 invoked from network); 5 Jul 2014 06:44:15 -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 Jul 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 1X3Jhm-0007Yt-5A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhl-0001Ok-Vt for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:14 +0000 Date: Sat, 05 Jul 2014 06:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Implement a dummy Performance Monitor for ARM32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7b4272ae4c14560b90327808425a2c1304b84fc Author: Julien Grall AuthorDate: Thu Apr 24 23:45:54 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:37:07 2014 +0100 xen/arm: Implement a dummy Performance Monitor for ARM32 XSA-93 (commit 0b18220 "xen/arm: Don't let guess access to Debug and Performance Monitor registers") disable Performance Monitor. When CONFIG_PERF_EVENTS is enabled in the Linux Kernel, regardless the ID_DFR0 (which tell if Perfomance Monitors Extension is implemented) the kernel will try to access to PMCR. Therefore we tell the guest we have 0 counters. Unfortunately we must always support PMCCNTR (the cycle counter): we just RAZ/WI for all PM register, which doesn't crash the kernel at least. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit aa0d443718372b46c432af7cb6274050cda32fc6) --- xen/arch/arm/traps.c | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/cpregs.h | 17 ++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 1498ea0..317803e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1393,6 +1393,34 @@ static void do_cp15_32(struct cpu_user_regs *regs, if ( cp32.read ) *r = v->arch.actlr; break; + + /* We could trap ID_DFR0 and tell the guest we don't support + * performance monitoring, but Linux doesn't check the ID_DFR0. + * Therefore it will read PMCR. + * + * We tell the guest we have 0 counters. Unfortunately we must + * always support PMCCNTR (the cyle counter): we just RAZ/WI for all + * PM register, which doesn't crash the kernel at least + */ + case HSR_CPREG32(PMCR): + case HSR_CPREG32(PMCNTENSET): + case HSR_CPREG32(PMCNTENCLR): + case HSR_CPREG32(PMOVSR): + case HSR_CPREG32(PMSWINC): + case HSR_CPREG32(PMSELR): + case HSR_CPREG32(PMCEID0): + case HSR_CPREG32(PMCEID1): + case HSR_CPREG32(PMCCNTR): + case HSR_CPREG32(PMXEVCNTR): + case HSR_CPREG32(PMXEVCNR): + case HSR_CPREG32(PMUSERENR): + case HSR_CPREG32(PMINTENSET): + case HSR_CPREG32(PMINTENCLR): + case HSR_CPREG32(PMOVSSET): + if ( cp32.read ) + *r = 0; + break; + default: #ifndef NDEBUG gdprintk(XENLOG_ERR, diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index bf8133e..f44e3b5 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -198,7 +198,22 @@ #define TLBIMVAH p15,4,c8,c7,1 /* Invalidate Unified Hyp. TLB by MVA */ #define TLBIALLNSNH p15,4,c8,c7,4 /* Invalidate Entire Non-Secure Non-Hyp. Unified TLB */ -/* CP15 CR9: */ +/* CP15 CR9: Performance monitors */ +#define PMCR p15,0,c9,c12,0 /* Perf. Mon. Control Register */ +#define PMCNTENSET p15,0,c9,c12,1 /* Perf. Mon. Count Enable Set register */ +#define PMCNTENCLR p15,0,c9,c12,2 /* Perf. Mon. Count Enable Clear register */ +#define PMOVSR p15,0,c9,c12,3 /* Perf. Mon. Overflow Flag Status Register */ +#define PMSWINC p15,0,c9,c12,4 /* Perf. Mon. Software Increment register */ +#define PMSELR p15,0,c9,c12,5 /* Perf. Mon. Event Counter Selection Register */ +#define PMCEID0 p15,0,c9,c12,6 /* Perf. Mon. Common Event Identification register 0 */ +#define PMCEID1 p15,0,c9,c12,7 /* Perf. Mon. Common Event Identification register 1 */ +#define PMCCNTR p15,0,c9,c13,0 /* Perf. Mon. Cycle Count Register */ +#define PMXEVCNTR p15,0,c9,c13,1 /* Perf. Mon. Event Type Select Register */ +#define PMXEVCNR p15,0,c9,c13,2 /* Perf. Mon. Event Count Register */ +#define PMUSERENR p15,0,c9,c14,0 /* Perf. Mon. User Enable Register */ +#define PMINTENSET p15,0,c9,c14,1 /* Perf. Mon. Interrupt Enable Set Register */ +#define PMINTENCLR p15,0,c9,c14,2 /* Perf. Mon. Interrupt Enable Clear Register */ +#define PMOVSSET p15,0,c9,c14,3 /* Perf. Mon. Overflow Flag Status Set register */ /* CP15 CR10: */ #define MAIR0 p15,0,c10,c2,0 /* Memory Attribute Indirection Register 0 AKA PRRR */ -- 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 Jul 05 06:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3Jhq-0006I9-FA; Sat, 05 Jul 2014 06: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 1X3Jho-0006Hz-Sa for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:17 +0000 Received: from [85.158.137.68:2465] by server-12.bemta-3.messagelabs.com id 93/EF-12714-0CE97B35; Sat, 05 Jul 2014 06:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404542654!14229517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8062 invoked from network); 5 Jul 2014 06:44:15 -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 Jul 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 1X3Jhm-0007Yt-5A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhl-0001Ok-Vt for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:14 +0000 Date: Sat, 05 Jul 2014 06:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Implement a dummy Performance Monitor for ARM32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7b4272ae4c14560b90327808425a2c1304b84fc Author: Julien Grall AuthorDate: Thu Apr 24 23:45:54 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:37:07 2014 +0100 xen/arm: Implement a dummy Performance Monitor for ARM32 XSA-93 (commit 0b18220 "xen/arm: Don't let guess access to Debug and Performance Monitor registers") disable Performance Monitor. When CONFIG_PERF_EVENTS is enabled in the Linux Kernel, regardless the ID_DFR0 (which tell if Perfomance Monitors Extension is implemented) the kernel will try to access to PMCR. Therefore we tell the guest we have 0 counters. Unfortunately we must always support PMCCNTR (the cycle counter): we just RAZ/WI for all PM register, which doesn't crash the kernel at least. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit aa0d443718372b46c432af7cb6274050cda32fc6) --- xen/arch/arm/traps.c | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/cpregs.h | 17 ++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 1498ea0..317803e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1393,6 +1393,34 @@ static void do_cp15_32(struct cpu_user_regs *regs, if ( cp32.read ) *r = v->arch.actlr; break; + + /* We could trap ID_DFR0 and tell the guest we don't support + * performance monitoring, but Linux doesn't check the ID_DFR0. + * Therefore it will read PMCR. + * + * We tell the guest we have 0 counters. Unfortunately we must + * always support PMCCNTR (the cyle counter): we just RAZ/WI for all + * PM register, which doesn't crash the kernel at least + */ + case HSR_CPREG32(PMCR): + case HSR_CPREG32(PMCNTENSET): + case HSR_CPREG32(PMCNTENCLR): + case HSR_CPREG32(PMOVSR): + case HSR_CPREG32(PMSWINC): + case HSR_CPREG32(PMSELR): + case HSR_CPREG32(PMCEID0): + case HSR_CPREG32(PMCEID1): + case HSR_CPREG32(PMCCNTR): + case HSR_CPREG32(PMXEVCNTR): + case HSR_CPREG32(PMXEVCNR): + case HSR_CPREG32(PMUSERENR): + case HSR_CPREG32(PMINTENSET): + case HSR_CPREG32(PMINTENCLR): + case HSR_CPREG32(PMOVSSET): + if ( cp32.read ) + *r = 0; + break; + default: #ifndef NDEBUG gdprintk(XENLOG_ERR, diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index bf8133e..f44e3b5 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -198,7 +198,22 @@ #define TLBIMVAH p15,4,c8,c7,1 /* Invalidate Unified Hyp. TLB by MVA */ #define TLBIALLNSNH p15,4,c8,c7,4 /* Invalidate Entire Non-Secure Non-Hyp. Unified TLB */ -/* CP15 CR9: */ +/* CP15 CR9: Performance monitors */ +#define PMCR p15,0,c9,c12,0 /* Perf. Mon. Control Register */ +#define PMCNTENSET p15,0,c9,c12,1 /* Perf. Mon. Count Enable Set register */ +#define PMCNTENCLR p15,0,c9,c12,2 /* Perf. Mon. Count Enable Clear register */ +#define PMOVSR p15,0,c9,c12,3 /* Perf. Mon. Overflow Flag Status Register */ +#define PMSWINC p15,0,c9,c12,4 /* Perf. Mon. Software Increment register */ +#define PMSELR p15,0,c9,c12,5 /* Perf. Mon. Event Counter Selection Register */ +#define PMCEID0 p15,0,c9,c12,6 /* Perf. Mon. Common Event Identification register 0 */ +#define PMCEID1 p15,0,c9,c12,7 /* Perf. Mon. Common Event Identification register 1 */ +#define PMCCNTR p15,0,c9,c13,0 /* Perf. Mon. Cycle Count Register */ +#define PMXEVCNTR p15,0,c9,c13,1 /* Perf. Mon. Event Type Select Register */ +#define PMXEVCNR p15,0,c9,c13,2 /* Perf. Mon. Event Count Register */ +#define PMUSERENR p15,0,c9,c14,0 /* Perf. Mon. User Enable Register */ +#define PMINTENSET p15,0,c9,c14,1 /* Perf. Mon. Interrupt Enable Set Register */ +#define PMINTENCLR p15,0,c9,c14,2 /* Perf. Mon. Interrupt Enable Clear Register */ +#define PMOVSSET p15,0,c9,c14,3 /* Perf. Mon. Overflow Flag Status Set register */ /* CP15 CR10: */ #define MAIR0 p15,0,c10,c2,0 /* Memory Attribute Indirection Register 0 AKA PRRR */ -- 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 Jul 05 06:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 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 1X3Ji0-0006Jf-Hv; Sat, 05 Jul 2014 06:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jhz-0006JW-Hs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:27 +0000 Received: from [193.109.254.147:38986] by server-13.bemta-14.messagelabs.com id 7F/23-14699-ACE97B35; Sat, 05 Jul 2014 06:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404542664!15590565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2593 invoked from network); 5 Jul 2014 06:44:25 -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; 5 Jul 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 1X3Jhw-0007Z1-G8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhw-0001Pq-As for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:24 +0000 Date: Sat, 05 Jul 2014 06:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Implement a dummy debug monitor for ARM32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ca5033563bd736f5d153a59fae7c02ec3a5abce Author: Julien Grall AuthorDate: Thu Apr 24 23:45:55 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:33 2014 +0100 xen/arm: Implement a dummy debug monitor for ARM32 XSA-93 (commit 0b18220 "xen/arm: Don't let guess access to Debug and Performance Monitors registers") disable Debug Registers access. When CONFIG_PERF_EVENTS is enabled in the Linux Kernel, it will try to initialize the debug monitors. If an error occured Linux won't use this feature. The implementation made Xen expose a minimal set of registers which let think the guest (i.e.) thinks HW debug won't work. Signed-off-by: Julien Grall [ ijc -- s/DBGCR/DBGBCR/ to use correct register name ] Acked-by: Ian Campbell (cherry picked from commit 68c69978352adb5ab7c06598056f9eb88d7d6031) [ ijc -- s/is_32bit_domain/is_pv32_domain/ ] --- xen/arch/arm/traps.c | 77 ++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/cpregs.h | 14 ++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 317803e..817f72e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1474,7 +1474,76 @@ static void do_cp15_64(struct cpu_user_regs *regs, advance_pc(regs, hsr); } -static void do_cp14(struct cpu_user_regs *regs, union hsr hsr) +static void do_cp14_32(struct cpu_user_regs *regs, union hsr hsr) +{ + struct hsr_cp32 cp32 = hsr.cp32; + uint32_t *r = (uint32_t *)select_user_reg(regs, cp32.reg); + struct domain *d = current->domain; + + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + + switch ( hsr.bits & HSR_CP32_REGS_MASK ) + { + case HSR_CPREG32(DBGDIDR): + + /* Read-only register */ + if ( !cp32.read ) + goto bad_cp; + + /* Implement the minimum requirements: + * - Number of watchpoints: 1 + * - Number of breakpoints: 2 + * - Version: ARMv7 v7.1 + * - Variant and Revision bits match MDIR + */ + *r = (1 << 24) | (5 << 16); + *r |= ((d->arch.vpidr >> 20) & 0xf) | (d->arch.vpidr & 0xf); + break; + + case HSR_CPREG32(DBGDSCRINT): + case HSR_CPREG32(DBGDSCREXT): + /* Implement debug status and control register as RAZ/WI. + * The OS won't use Hardware debug if MDBGen not set + */ + if ( cp32.read ) + *r = 0; + break; + case HSR_CPREG32(DBGVCR): + case HSR_CPREG32(DBGOSLAR): + case HSR_CPREG32(DBGBVR0): + case HSR_CPREG32(DBGBCR0): + case HSR_CPREG32(DBGWVR0): + case HSR_CPREG32(DBGWCR0): + case HSR_CPREG32(DBGBVR1): + case HSR_CPREG32(DBGBCR1): + case HSR_CPREG32(DBGOSDLR): + /* RAZ/WI */ + if ( cp32.read ) + *r = 0; + break; + + default: +bad_cp: +#ifndef NDEBUG + gdprintk(XENLOG_ERR, + "%s p14, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", + cp32.read ? "mrc" : "mcr", + cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", + hsr.bits & HSR_CP32_REGS_MASK); +#endif + inject_undef32_exception(regs); + return; + } + + advance_pc(regs, hsr); +} + +static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) { if ( !check_conditional_instr(regs, hsr) ) { @@ -1726,10 +1795,14 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) do_cp15_64(regs, hsr); break; case HSR_EC_CP14_32: + if ( !is_pv32_domain(current->domain) ) + goto bad_trap; + do_cp14_32(regs, hsr); + break; case HSR_EC_CP14_DBG: if ( !is_pv32_domain(current->domain) ) goto bad_trap; - do_cp14(regs, hsr); + do_cp14_dbg(regs, hsr); break; case HSR_EC_CP: if ( !is_pv32_domain(current->domain) ) diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index f44e3b5..f1100c8 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -71,6 +71,20 @@ /* Coprocessor 14 */ +/* CP14 0: Debug Register interface */ +#define DBGDIDR p14,0,c0,c0,0 /* Debug ID Register */ +#define DBGDSCRINT p14,0,c0,c1,0 /* Debug Status and Control Internal */ +#define DBGDSCREXT p14,0,c0,c2,2 /* Debug Status and Control External */ +#define DBGVCR p14,0,c0,c7,0 /* Vector Catch */ +#define DBGBVR0 p14,0,c0,c0,4 /* Breakpoint Value 0 */ +#define DBGBCR0 p14,0,c0,c0,5 /* Breakpoint Control 0 */ +#define DBGWVR0 p14,0,c0,c0,6 /* Watchpoint Value 0 */ +#define DBGWCR0 p14,0,c0,c0,7 /* Watchpoint Control 0 */ +#define DBGBVR1 p14,0,c0,c1,4 /* Breakpoint Value 1 */ +#define DBGBCR1 p14,0,c0,c1,5 /* Breakpoint Control 1 */ +#define DBGOSLAR p14,0,c1,c0,4 /* OS Lock Access */ +#define DBGOSDLR p14,0,c1,c3,4 /* OS Double Lock */ + /* CP14 CR0: */ #define TEECR p14,6,c0,c0,0 /* ThumbEE Configuration Register */ -- 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 Jul 05 06:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 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 1X3Ji0-0006Jf-Hv; Sat, 05 Jul 2014 06:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jhz-0006JW-Hs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:27 +0000 Received: from [193.109.254.147:38986] by server-13.bemta-14.messagelabs.com id 7F/23-14699-ACE97B35; Sat, 05 Jul 2014 06:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404542664!15590565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2593 invoked from network); 5 Jul 2014 06:44:25 -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; 5 Jul 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 1X3Jhw-0007Z1-G8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jhw-0001Pq-As for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:24 +0000 Date: Sat, 05 Jul 2014 06:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Implement a dummy debug monitor for ARM32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ca5033563bd736f5d153a59fae7c02ec3a5abce Author: Julien Grall AuthorDate: Thu Apr 24 23:45:55 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:33 2014 +0100 xen/arm: Implement a dummy debug monitor for ARM32 XSA-93 (commit 0b18220 "xen/arm: Don't let guess access to Debug and Performance Monitors registers") disable Debug Registers access. When CONFIG_PERF_EVENTS is enabled in the Linux Kernel, it will try to initialize the debug monitors. If an error occured Linux won't use this feature. The implementation made Xen expose a minimal set of registers which let think the guest (i.e.) thinks HW debug won't work. Signed-off-by: Julien Grall [ ijc -- s/DBGCR/DBGBCR/ to use correct register name ] Acked-by: Ian Campbell (cherry picked from commit 68c69978352adb5ab7c06598056f9eb88d7d6031) [ ijc -- s/is_32bit_domain/is_pv32_domain/ ] --- xen/arch/arm/traps.c | 77 ++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/cpregs.h | 14 ++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 317803e..817f72e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1474,7 +1474,76 @@ static void do_cp15_64(struct cpu_user_regs *regs, advance_pc(regs, hsr); } -static void do_cp14(struct cpu_user_regs *regs, union hsr hsr) +static void do_cp14_32(struct cpu_user_regs *regs, union hsr hsr) +{ + struct hsr_cp32 cp32 = hsr.cp32; + uint32_t *r = (uint32_t *)select_user_reg(regs, cp32.reg); + struct domain *d = current->domain; + + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + + switch ( hsr.bits & HSR_CP32_REGS_MASK ) + { + case HSR_CPREG32(DBGDIDR): + + /* Read-only register */ + if ( !cp32.read ) + goto bad_cp; + + /* Implement the minimum requirements: + * - Number of watchpoints: 1 + * - Number of breakpoints: 2 + * - Version: ARMv7 v7.1 + * - Variant and Revision bits match MDIR + */ + *r = (1 << 24) | (5 << 16); + *r |= ((d->arch.vpidr >> 20) & 0xf) | (d->arch.vpidr & 0xf); + break; + + case HSR_CPREG32(DBGDSCRINT): + case HSR_CPREG32(DBGDSCREXT): + /* Implement debug status and control register as RAZ/WI. + * The OS won't use Hardware debug if MDBGen not set + */ + if ( cp32.read ) + *r = 0; + break; + case HSR_CPREG32(DBGVCR): + case HSR_CPREG32(DBGOSLAR): + case HSR_CPREG32(DBGBVR0): + case HSR_CPREG32(DBGBCR0): + case HSR_CPREG32(DBGWVR0): + case HSR_CPREG32(DBGWCR0): + case HSR_CPREG32(DBGBVR1): + case HSR_CPREG32(DBGBCR1): + case HSR_CPREG32(DBGOSDLR): + /* RAZ/WI */ + if ( cp32.read ) + *r = 0; + break; + + default: +bad_cp: +#ifndef NDEBUG + gdprintk(XENLOG_ERR, + "%s p14, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", + cp32.read ? "mrc" : "mcr", + cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", + hsr.bits & HSR_CP32_REGS_MASK); +#endif + inject_undef32_exception(regs); + return; + } + + advance_pc(regs, hsr); +} + +static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) { if ( !check_conditional_instr(regs, hsr) ) { @@ -1726,10 +1795,14 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) do_cp15_64(regs, hsr); break; case HSR_EC_CP14_32: + if ( !is_pv32_domain(current->domain) ) + goto bad_trap; + do_cp14_32(regs, hsr); + break; case HSR_EC_CP14_DBG: if ( !is_pv32_domain(current->domain) ) goto bad_trap; - do_cp14(regs, hsr); + do_cp14_dbg(regs, hsr); break; case HSR_EC_CP: if ( !is_pv32_domain(current->domain) ) diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index f44e3b5..f1100c8 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -71,6 +71,20 @@ /* Coprocessor 14 */ +/* CP14 0: Debug Register interface */ +#define DBGDIDR p14,0,c0,c0,0 /* Debug ID Register */ +#define DBGDSCRINT p14,0,c0,c1,0 /* Debug Status and Control Internal */ +#define DBGDSCREXT p14,0,c0,c2,2 /* Debug Status and Control External */ +#define DBGVCR p14,0,c0,c7,0 /* Vector Catch */ +#define DBGBVR0 p14,0,c0,c0,4 /* Breakpoint Value 0 */ +#define DBGBCR0 p14,0,c0,c0,5 /* Breakpoint Control 0 */ +#define DBGWVR0 p14,0,c0,c0,6 /* Watchpoint Value 0 */ +#define DBGWCR0 p14,0,c0,c0,7 /* Watchpoint Control 0 */ +#define DBGBVR1 p14,0,c0,c1,4 /* Breakpoint Value 1 */ +#define DBGBCR1 p14,0,c0,c1,5 /* Breakpoint Control 1 */ +#define DBGOSLAR p14,0,c1,c0,4 /* OS Lock Access */ +#define DBGOSDLR p14,0,c1,c3,4 /* OS Double Lock */ + /* CP14 CR0: */ #define TEECR p14,6,c0,c0,0 /* ThumbEE Configuration Register */ -- 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 Jul 05 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 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 1X3JiA-0006Lj-LS; Sat, 05 Jul 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 1X3Ji9-0006LQ-3x for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:37 +0000 Received: from [193.109.254.147:20096] by server-11.bemta-14.messagelabs.com id AE/EB-12767-4DE97B35; Sat, 05 Jul 2014 06:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404542674!15590578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3507 invoked from network); 5 Jul 2014 06:44:35 -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; 5 Jul 2014 06:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ji6-0007Z9-LO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Ji6-0001QG-Ix for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:34 +0000 Date: Sat, 05 Jul 2014 06:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652fb44ffbc5f3ff576b6d2349a49910170e7d2b Author: Ian Campbell AuthorDate: Thu Jun 26 09:53:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:45 2014 +0100 xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO As with HCR_EL2.{IMO,AMO} we want to route FIQs to Xen not the guest. See ARM ARM DDI 0406C.b B1.8.4. So far none of the platforms which we support use FIQ for anything, but when we end up supporting one it would be far better to surprise Xen with them than whatever guest happens to be running... Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall (cherry picked from commit 4bb74e39987b428429c2aacad7f59356d4942e39) Conflicts: xen/arch/arm/traps.c --- xen/arch/arm/traps.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 817f72e..04720b1 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -89,8 +89,8 @@ void __cpuinit init_traps(void) CPTR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| - HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| + HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); isb(); } -- 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 Jul 05 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 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 1X3JiA-0006Lj-LS; Sat, 05 Jul 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 1X3Ji9-0006LQ-3x for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:37 +0000 Received: from [193.109.254.147:20096] by server-11.bemta-14.messagelabs.com id AE/EB-12767-4DE97B35; Sat, 05 Jul 2014 06:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404542674!15590578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3507 invoked from network); 5 Jul 2014 06:44:35 -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; 5 Jul 2014 06:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ji6-0007Z9-LO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Ji6-0001QG-Ix for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:34 +0000 Date: Sat, 05 Jul 2014 06:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652fb44ffbc5f3ff576b6d2349a49910170e7d2b Author: Ian Campbell AuthorDate: Thu Jun 26 09:53:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:45 2014 +0100 xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO As with HCR_EL2.{IMO,AMO} we want to route FIQs to Xen not the guest. See ARM ARM DDI 0406C.b B1.8.4. So far none of the platforms which we support use FIQ for anything, but when we end up supporting one it would be far better to surprise Xen with them than whatever guest happens to be running... Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall (cherry picked from commit 4bb74e39987b428429c2aacad7f59356d4942e39) Conflicts: xen/arch/arm/traps.c --- xen/arch/arm/traps.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 817f72e..04720b1 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -89,8 +89,8 @@ void __cpuinit init_traps(void) CPTR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| - HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| + HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); isb(); } -- 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 Jul 05 06:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3JiK-0006Ng-O9; Sat, 05 Jul 2014 06:44:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JiJ-0006NR-LJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:47 +0000 Received: from [193.109.254.147:39458] by server-11.bemta-14.messagelabs.com id EB/FB-12767-FDE97B35; Sat, 05 Jul 2014 06:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1404542685!15639495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21299 invoked from network); 5 Jul 2014 06:44:46 -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; 5 Jul 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 1X3JiG-0007ZF-UB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JiG-0001Qd-PC for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:44 +0000 Date: Sat, 05 Jul 2014 06:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2800a8f93c828671ee4b2517accea8c546eb883 Author: Ian Campbell AuthorDate: Fri Jun 13 13:15:04 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:46 2014 +0100 xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. I'm not sure why this wasn't added at the same time as the other debug registers. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit 92b0b80f0d2d29d0e80bf35ea839ed6058b7f0fa) --- xen/arch/arm/traps.c | 4 +++- xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 04720b1..e2e2db3 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1595,9 +1595,11 @@ static void do_sysreg(struct cpu_user_regs *regs, /* - Breakpoints */ HSR_SYSREG_DBG_CASES(DBGBVR): HSR_SYSREG_DBG_CASES(DBGBCR): - /* - Watchpoints */ + /* - Watchpoints */ HSR_SYSREG_DBG_CASES(DBGWVR): HSR_SYSREG_DBG_CASES(DBGWCR): + /* - Double Lock Register */ + case HSR_SYSREG_OSDLR_EL1: if ( hsr.sysreg.read ) *x = 0; /* else: write ignored */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 4a4de34..b00871c 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -42,6 +42,7 @@ #define HSR_SYSREG_MDSCR_EL1 HSR_SYSREG(2,0,c0,c2,2) #define HSR_SYSREG_OSLAR_EL1 HSR_SYSREG(2,0,c1,c0,4) +#define HSR_SYSREG_OSDLR_EL1 HSR_SYSREG(2,0,c1,c3,4) #define HSR_SYSREG_DBGBVRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,4) #define HSR_SYSREG_DBGBCRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,5) -- 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 Jul 05 06:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3JiK-0006Ng-O9; Sat, 05 Jul 2014 06:44:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JiJ-0006NR-LJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:47 +0000 Received: from [193.109.254.147:39458] by server-11.bemta-14.messagelabs.com id EB/FB-12767-FDE97B35; Sat, 05 Jul 2014 06:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1404542685!15639495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21299 invoked from network); 5 Jul 2014 06:44:46 -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; 5 Jul 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 1X3JiG-0007ZF-UB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JiG-0001Qd-PC for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:44 +0000 Date: Sat, 05 Jul 2014 06:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2800a8f93c828671ee4b2517accea8c546eb883 Author: Ian Campbell AuthorDate: Fri Jun 13 13:15:04 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:46 2014 +0100 xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. I'm not sure why this wasn't added at the same time as the other debug registers. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit 92b0b80f0d2d29d0e80bf35ea839ed6058b7f0fa) --- xen/arch/arm/traps.c | 4 +++- xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 04720b1..e2e2db3 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1595,9 +1595,11 @@ static void do_sysreg(struct cpu_user_regs *regs, /* - Breakpoints */ HSR_SYSREG_DBG_CASES(DBGBVR): HSR_SYSREG_DBG_CASES(DBGBCR): - /* - Watchpoints */ + /* - Watchpoints */ HSR_SYSREG_DBG_CASES(DBGWVR): HSR_SYSREG_DBG_CASES(DBGWCR): + /* - Double Lock Register */ + case HSR_SYSREG_OSDLR_EL1: if ( hsr.sysreg.read ) *x = 0; /* else: write ignored */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 4a4de34..b00871c 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -42,6 +42,7 @@ #define HSR_SYSREG_MDSCR_EL1 HSR_SYSREG(2,0,c0,c2,2) #define HSR_SYSREG_OSLAR_EL1 HSR_SYSREG(2,0,c1,c0,4) +#define HSR_SYSREG_OSDLR_EL1 HSR_SYSREG(2,0,c1,c3,4) #define HSR_SYSREG_DBGBVRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,4) #define HSR_SYSREG_DBGBCRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,5) -- 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 Jul 05 06:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3JiU-0006Pb-Rd; Sat, 05 Jul 2014 06:44:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JiT-0006PB-Hs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:57 +0000 Received: from [85.158.143.35:14818] by server-2.bemta-4.messagelabs.com id D5/EC-18579-8EE97B35; Sat, 05 Jul 2014 06:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1404542695!16013904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22155 invoked from network); 5 Jul 2014 06:44: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; 5 Jul 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 1X3JiR-0007ZO-29 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JiR-0001Qz-0S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:55 +0000 Date: Sat, 05 Jul 2014 06:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: make sure gcc doesn't use floating-point registers on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d774a33b72b933ef425f52cb771dee60e809201e Author: Ian Campbell AuthorDate: Thu Jun 26 17:30:14 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:47 2014 +0100 xen: arm: make sure gcc doesn't use floating-point registers on arm64 By using -mgeneral-regs-only which is the Aarch64 equivalent to -msoft-float. Otherwise gcc will corrupt the d* registers, which we don't save/restore when trapping to/from the hypervisor. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit c0726c18e8135f87a5a5793d993d6bea1e3fa925) --- xen/arch/arm/Rules.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index aa2e79f..2db39ad 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -27,6 +27,7 @@ endif ifeq ($(TARGET_SUBARCH),arm64) CFLAGS += -mcpu=generic +CFLAGS += -mgeneral-regs-only # No fp registers etc arm32 := n arm64 := y endif -- 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 Jul 05 06:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06: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 1X3JiU-0006Pb-Rd; Sat, 05 Jul 2014 06:44:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JiT-0006PB-Hs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:57 +0000 Received: from [85.158.143.35:14818] by server-2.bemta-4.messagelabs.com id D5/EC-18579-8EE97B35; Sat, 05 Jul 2014 06:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1404542695!16013904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22155 invoked from network); 5 Jul 2014 06:44: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; 5 Jul 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 1X3JiR-0007ZO-29 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JiR-0001Qz-0S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:44:55 +0000 Date: Sat, 05 Jul 2014 06:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: make sure gcc doesn't use floating-point registers on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d774a33b72b933ef425f52cb771dee60e809201e Author: Ian Campbell AuthorDate: Thu Jun 26 17:30:14 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 2 10:47:47 2014 +0100 xen: arm: make sure gcc doesn't use floating-point registers on arm64 By using -mgeneral-regs-only which is the Aarch64 equivalent to -msoft-float. Otherwise gcc will corrupt the d* registers, which we don't save/restore when trapping to/from the hypervisor. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit c0726c18e8135f87a5a5793d993d6bea1e3fa925) --- xen/arch/arm/Rules.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index aa2e79f..2db39ad 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -27,6 +27,7 @@ endif ifeq ($(TARGET_SUBARCH),arm64) CFLAGS += -mcpu=generic +CFLAGS += -mgeneral-regs-only # No fp registers etc arm32 := n arm64 := y endif -- 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 Jul 05 06:45:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3Jij-0006R5-0m; Sat, 05 Jul 2014 06:45:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jih-0006Qa-2M for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:11 +0000 Received: from [85.158.143.35:19272] by server-1.bemta-4.messagelabs.com id 4F/58-09496-6FE97B35; Sat, 05 Jul 2014 06:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1404542708!12553856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21091 invoked from network); 5 Jul 2014 06:45:09 -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; 5 Jul 2014 06:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jib-0007aP-J1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jib-0001Rb-6G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:05 +0000 Date: Sat, 05 Jul 2014 06:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] blktap2: Fix two 'maybe uninitialized' 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 5e39eb05aa2a6d9bfa6c3b3e299b071422498625 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:09 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 06:45:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3Jij-0006R5-0m; Sat, 05 Jul 2014 06:45:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jih-0006Qa-2M for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:11 +0000 Received: from [85.158.143.35:19272] by server-1.bemta-4.messagelabs.com id 4F/58-09496-6FE97B35; Sat, 05 Jul 2014 06:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1404542708!12553856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21091 invoked from network); 5 Jul 2014 06:45:09 -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; 5 Jul 2014 06:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jib-0007aP-J1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jib-0001Rb-6G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:05 +0000 Date: Sat, 05 Jul 2014 06:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] blktap2: Fix two 'maybe uninitialized' 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 5e39eb05aa2a6d9bfa6c3b3e299b071422498625 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:09 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 06:45:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3Jiu-0006T9-46; Sat, 05 Jul 2014 06:45:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jis-0006Sq-4q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:22 +0000 Received: from [85.158.139.211:37403] by server-11.bemta-5.messagelabs.com id 9C/0F-01425-10F97B35; Sat, 05 Jul 2014 06:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404542719!13769495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26272 invoked from network); 5 Jul 2014 06:45:20 -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; 5 Jul 2014 06:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jip-0007aV-1H for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jio-0001S1-W1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:19 +0000 Date: Sat, 05 Jul 2014 06:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxl: Fix free() of wild pointer in libxl__initiate_device_remove() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d40bed867d9550afe3d6e7c369647905109ce831 Author: Andrew Cooper AuthorDate: Wed Jun 18 19:04:14 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 15:41:59 2014 +0100 tools/libxl: Fix free() of wild pointer in libxl__initiate_device_remove() libxl__initiate_device_remove() had a preexisting error path issue where libxl_dominfo_dispose() could be called on a libxl_dominfo object before it had been initialised with libxl_dominfo_init(). This was safe until c/s ab44401 added the pointer ssid_label, which point libxl_dominfo_dispose() free()s. Unconditionally initialise info in libxl__initiate_device_remove() before taking an error path which will free it. Coverity-ID: 1223212 Signed-off-by: Andrew Cooper CC: Wei Liu CC: Ian Campbell CC: Ian Jackson (cherry picked from commit ddb4aa5dfa13781e8f31ba20923c14c1a083ce83) --- tools/libxl/libxl_device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ba7d100..29ed547 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -775,6 +775,8 @@ void libxl__initiate_device_remove(libxl__egc *egc, uint32_t my_domid, domid = aodev->dev->domid; int rc = 0; + libxl_dominfo_init(&info); + rc = libxl__get_domid(gc, &my_domid); if (rc) { LOG(ERROR, "unable to get my domid"); @@ -782,7 +784,6 @@ void libxl__initiate_device_remove(libxl__egc *egc, } if (my_domid == LIBXL_TOOLSTACK_DOMID) { - libxl_dominfo_init(&info); rc = libxl_domain_info(CTX, &info, domid); if (rc) { LOG(ERROR, "unable to get info for domain %d", domid); -- 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 Jul 05 06:45:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3Jiu-0006T9-46; Sat, 05 Jul 2014 06:45:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jis-0006Sq-4q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:22 +0000 Received: from [85.158.139.211:37403] by server-11.bemta-5.messagelabs.com id 9C/0F-01425-10F97B35; Sat, 05 Jul 2014 06:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404542719!13769495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26272 invoked from network); 5 Jul 2014 06:45:20 -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; 5 Jul 2014 06:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jip-0007aV-1H for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jio-0001S1-W1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:19 +0000 Date: Sat, 05 Jul 2014 06:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxl: Fix free() of wild pointer in libxl__initiate_device_remove() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d40bed867d9550afe3d6e7c369647905109ce831 Author: Andrew Cooper AuthorDate: Wed Jun 18 19:04:14 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 15:41:59 2014 +0100 tools/libxl: Fix free() of wild pointer in libxl__initiate_device_remove() libxl__initiate_device_remove() had a preexisting error path issue where libxl_dominfo_dispose() could be called on a libxl_dominfo object before it had been initialised with libxl_dominfo_init(). This was safe until c/s ab44401 added the pointer ssid_label, which point libxl_dominfo_dispose() free()s. Unconditionally initialise info in libxl__initiate_device_remove() before taking an error path which will free it. Coverity-ID: 1223212 Signed-off-by: Andrew Cooper CC: Wei Liu CC: Ian Campbell CC: Ian Jackson (cherry picked from commit ddb4aa5dfa13781e8f31ba20923c14c1a083ce83) --- tools/libxl/libxl_device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ba7d100..29ed547 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -775,6 +775,8 @@ void libxl__initiate_device_remove(libxl__egc *egc, uint32_t my_domid, domid = aodev->dev->domid; int rc = 0; + libxl_dominfo_init(&info); + rc = libxl__get_domid(gc, &my_domid); if (rc) { LOG(ERROR, "unable to get my domid"); @@ -782,7 +784,6 @@ void libxl__initiate_device_remove(libxl__egc *egc, } if (my_domid == LIBXL_TOOLSTACK_DOMID) { - libxl_dominfo_init(&info); rc = libxl_domain_info(CTX, &info, domid); if (rc) { LOG(ERROR, "unable to get info for domain %d", domid); -- 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 Jul 05 06:45:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj3-0006UV-Fv; Sat, 05 Jul 2014 06:45:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj1-0006UC-Vc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:32 +0000 Received: from [85.158.143.35:15775] by server-2.bemta-4.messagelabs.com id 43/1D-18579-B0F97B35; Sat, 05 Jul 2014 06:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1404542729!16034884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12564 invoked from network); 5 Jul 2014 06:45:30 -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; 5 Jul 2014 06:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jiz-0007ad-6U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jiz-0001St-4e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:29 +0000 Date: Sat, 05 Jul 2014 06:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: arm: report an error if the guest RAM is too large X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34a314265f43113fc3e7f68ca04370541ea1e7c5 Author: Ian Campbell AuthorDate: Thu May 22 10:46:37 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 15:53:24 2014 +0100 tools: arm: report an error if the guest RAM is too large Due to the layout of the guest physical address space we cannot support more than 768M of RAM before overrunning the area set aside for the grant table. Due to the presence of the magic pages at the end of the RAM region guests are actually limited to 767M. Catch this case during domain build and fail gracefully instead of obscurely later on. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson (cherry picked from commit 5a959f44ed03398870b6ec0dfebb59dcd5981f94) --- tools/libxc/xc_dom_arm.c | 9 +++++++++ xen/include/public/arch-arm.h | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 60ac51a..d5831a2 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -272,6 +272,15 @@ int arch_setup_meminit(struct xc_dom_image *dom) return -1; } + if ( ramsize > GUEST_RAM_SIZE - NR_MAGIC_PAGES*XC_PAGE_SIZE ) + { + DOMPRINTF("%s: ram size is too large for guest address space: " + "%"PRIx64" > %llx", + __FUNCTION__, ramsize, + GUEST_RAM_SIZE - NR_MAGIC_PAGES*XC_PAGE_SIZE); + return -1; + } + rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) return rc; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 7496556..dd53c94 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -369,7 +369,8 @@ typedef uint64_t xen_callback_t; #define GUEST_GICC_BASE 0x2c002000ULL #define GUEST_GICC_SIZE 0x100ULL -#define GUEST_RAM_BASE 0x80000000ULL +#define GUEST_RAM_BASE 0x80000000ULL /* 768M @ 2GB */ +#define GUEST_RAM_SIZE 0x30000000ULL #define GUEST_GNTTAB_BASE 0xb0000000ULL #define GUEST_GNTTAB_SIZE 0x00020000ULL -- 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 Jul 05 06:45:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj3-0006UV-Fv; Sat, 05 Jul 2014 06:45:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj1-0006UC-Vc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:32 +0000 Received: from [85.158.143.35:15775] by server-2.bemta-4.messagelabs.com id 43/1D-18579-B0F97B35; Sat, 05 Jul 2014 06:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1404542729!16034884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12564 invoked from network); 5 Jul 2014 06:45:30 -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; 5 Jul 2014 06:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jiz-0007ad-6U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jiz-0001St-4e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:29 +0000 Date: Sat, 05 Jul 2014 06:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: arm: report an error if the guest RAM is too large X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34a314265f43113fc3e7f68ca04370541ea1e7c5 Author: Ian Campbell AuthorDate: Thu May 22 10:46:37 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 15:53:24 2014 +0100 tools: arm: report an error if the guest RAM is too large Due to the layout of the guest physical address space we cannot support more than 768M of RAM before overrunning the area set aside for the grant table. Due to the presence of the magic pages at the end of the RAM region guests are actually limited to 767M. Catch this case during domain build and fail gracefully instead of obscurely later on. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson (cherry picked from commit 5a959f44ed03398870b6ec0dfebb59dcd5981f94) --- tools/libxc/xc_dom_arm.c | 9 +++++++++ xen/include/public/arch-arm.h | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 60ac51a..d5831a2 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -272,6 +272,15 @@ int arch_setup_meminit(struct xc_dom_image *dom) return -1; } + if ( ramsize > GUEST_RAM_SIZE - NR_MAGIC_PAGES*XC_PAGE_SIZE ) + { + DOMPRINTF("%s: ram size is too large for guest address space: " + "%"PRIx64" > %llx", + __FUNCTION__, ramsize, + GUEST_RAM_SIZE - NR_MAGIC_PAGES*XC_PAGE_SIZE); + return -1; + } + rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) return rc; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 7496556..dd53c94 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -369,7 +369,8 @@ typedef uint64_t xen_callback_t; #define GUEST_GICC_BASE 0x2c002000ULL #define GUEST_GICC_SIZE 0x100ULL -#define GUEST_RAM_BASE 0x80000000ULL +#define GUEST_RAM_BASE 0x80000000ULL /* 768M @ 2GB */ +#define GUEST_RAM_SIZE 0x30000000ULL #define GUEST_GNTTAB_BASE 0xb0000000ULL #define GUEST_GNTTAB_SIZE 0x00020000ULL -- 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 Jul 05 06:45:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3JjC-0006WA-Io; Sat, 05 Jul 2014 06:45:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjC-0006Vx-06 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:42 +0000 Received: from [85.158.137.68:5727] by server-14.bemta-3.messagelabs.com id EE/AE-19846-51F97B35; Sat, 05 Jul 2014 06:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404542739!14198811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12256 invoked from network); 5 Jul 2014 06:45:40 -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; 5 Jul 2014 06:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj9-0007ag-C8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jj9-0001TJ-9b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:39 +0000 Date: Sat, 05 Jul 2014 06:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG 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 9fc0c44a691c5166908cf1015c4a73d65c711d04 Author: Ian Jackson AuthorDate: Wed Jul 2 16:06:31 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 16:06:31 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f9a44b7..54d6ecc 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 Jul 05 06:45:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3JjC-0006WA-Io; Sat, 05 Jul 2014 06:45:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjC-0006Vx-06 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:42 +0000 Received: from [85.158.137.68:5727] by server-14.bemta-3.messagelabs.com id EE/AE-19846-51F97B35; Sat, 05 Jul 2014 06:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404542739!14198811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12256 invoked from network); 5 Jul 2014 06:45:40 -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; 5 Jul 2014 06:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Jj9-0007ag-C8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Jj9-0001TJ-9b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:39 +0000 Date: Sat, 05 Jul 2014 06:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG 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 9fc0c44a691c5166908cf1015c4a73d65c711d04 Author: Ian Jackson AuthorDate: Wed Jul 2 16:06:31 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 16:06:31 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f9a44b7..54d6ecc 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 Jul 05 06:45:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3JjM-0006Y0-LX; Sat, 05 Jul 2014 06:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjM-0006Xn-1F for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:52 +0000 Received: from [85.158.143.35:20268] by server-3.bemta-4.messagelabs.com id 80/5F-16194-F1F97B35; Sat, 05 Jul 2014 06:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1404542749!15666158!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9576 invoked from network); 5 Jul 2014 06:45:50 -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; 5 Jul 2014 06:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjJ-0007ap-G8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JjJ-0001Tf-FD for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:49 +0000 Date: Sat, 05 Jul 2014 06:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update - FIX! X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee81dda7c3767bd9af7ae84a86d1be56d8fad343 Author: Ian Jackson AuthorDate: Thu Jul 3 13:58:23 2014 +0100 Commit: Ian Jackson CommitDate: Thu Jul 3 13:58:36 2014 +0100 QEMU_TAG update - FIX! My qemu push and tag update script had transposed a revision number from qemu-xen-4.3-testing into xen-4.4-testing's Config.mk! The script is now fixed, but we also need to fix the tree. Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 54d6ecc..fbc6fc3 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +QEMU_TAG ?= 6ae4e588081620b141071eb010ec40aca7e12876 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads -- 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 Jul 05 06:45:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 06:45: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 1X3JjM-0006Y0-LX; Sat, 05 Jul 2014 06:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjM-0006Xn-1F for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:52 +0000 Received: from [85.158.143.35:20268] by server-3.bemta-4.messagelabs.com id 80/5F-16194-F1F97B35; Sat, 05 Jul 2014 06:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1404542749!15666158!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9576 invoked from network); 5 Jul 2014 06:45:50 -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; 5 Jul 2014 06:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3JjJ-0007ap-G8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3JjJ-0001Tf-FD for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 06:45:49 +0000 Date: Sat, 05 Jul 2014 06:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update - FIX! X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee81dda7c3767bd9af7ae84a86d1be56d8fad343 Author: Ian Jackson AuthorDate: Thu Jul 3 13:58:23 2014 +0100 Commit: Ian Jackson CommitDate: Thu Jul 3 13:58:36 2014 +0100 QEMU_TAG update - FIX! My qemu push and tag update script had transposed a revision number from qemu-xen-4.3-testing into xen-4.4-testing's Config.mk! The script is now fixed, but we also need to fix the tree. Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 54d6ecc..fbc6fc3 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +QEMU_TAG ?= 6ae4e588081620b141071eb010ec40aca7e12876 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads -- 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 Jul 05 10:55:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 10:55: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 1X3NcY-0003LA-Vf; Sat, 05 Jul 2014 10:55:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3NcY-0003L4-G3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:06 +0000 Received: from [85.158.137.68:19077] by server-17.bemta-3.messagelabs.com id 68/3A-05521-989D7B35; Sat, 05 Jul 2014 10:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1404557703!14207665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6888 invoked from network); 5 Jul 2014 10:55:05 -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 Jul 2014 10:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3NcV-00028p-4W for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3NcU-0000BA-RJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:02 +0000 Date: Sat, 05 Jul 2014 10:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] blktap2: Fix two 'maybe uninitialized' 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 c591613f8c629f18a521269d67240d532f2c27d1 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:24 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) (cherry picked from commit 5e39eb05aa2a6d9bfa6c3b3e299b071422498625) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 10:55:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 10:55: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 1X3NcY-0003LA-Vf; Sat, 05 Jul 2014 10:55:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3NcY-0003L4-G3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:06 +0000 Received: from [85.158.137.68:19077] by server-17.bemta-3.messagelabs.com id 68/3A-05521-989D7B35; Sat, 05 Jul 2014 10:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1404557703!14207665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6888 invoked from network); 5 Jul 2014 10:55:05 -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 Jul 2014 10:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3NcV-00028p-4W for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3NcU-0000BA-RJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:02 +0000 Date: Sat, 05 Jul 2014 10:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] blktap2: Fix two 'maybe uninitialized' 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 c591613f8c629f18a521269d67240d532f2c27d1 Author: Dario Faggioli AuthorDate: Fri Jun 20 16:09:00 2014 +0200 Commit: Ian Jackson CommitDate: Wed Jul 2 15:38:24 2014 +0100 blktap2: Fix two 'maybe uninitialized' variables for which gcc 4.9.0 complains about, like this: block-qcow.c: In function `get_cluster_offset': block-qcow.c:431:3: error: `tmp_ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] memcpy(tmp_ptr, l1_ptr, 4096); ^ block-qcow.c:606:7: error: `tmp_ptr2' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (write(s->fd, tmp_ptr2, 4096) != 4096) { ^ cc1: all warnings being treated as errors /home/dario/Sources/xen/xen/xen.git/tools/blktap2/drivers/../../../tools/Rules.mk:89: recipe for target 'block-qcow.o' failed make[5]: *** [block-qcow.o] Error 1 The proper behavior is to return upon allocation failure. About what to return, 0 seems the best option, looking at both the function and the call sites. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson (cherry picked from commit 345e44a85d71a1a910385f33c7f1ba3683026d18) (cherry picked from commit 5e39eb05aa2a6d9bfa6c3b3e299b071422498625) --- tools/blktap2/drivers/block-qcow.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index d5053d4..b45bcaa 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -427,6 +427,7 @@ static uint64_t get_cluster_offset(struct tdqcow_state *s, if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr, l1_ptr, 4096); @@ -600,6 +601,7 @@ found: if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { DPRINTF("ERROR allocating memory for L1 table\n"); + return 0; } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); -- 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 Jul 05 10:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 10:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ncj-0003MM-27; Sat, 05 Jul 2014 10:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Nch-0003MB-Q5 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:15 +0000 Received: from [85.158.143.35:26992] by server-2.bemta-4.messagelabs.com id BD/1D-18579-399D7B35; Sat, 05 Jul 2014 10:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1404557713!15985218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30803 invoked from network); 5 Jul 2014 10:55:14 -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; 5 Jul 2014 10:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ncf-00028t-A3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Ncf-0000Bb-7S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:13 +0000 Date: Sat, 05 Jul 2014 10:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG 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 83c1512e488637286c9a0cf4f58ed85094c15ac2 Author: Ian Jackson AuthorDate: Wed Jul 2 16:06:12 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 16:06:12 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c2ea4b3..923a697 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.2 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 Jul 05 10:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 10:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ncj-0003MM-27; Sat, 05 Jul 2014 10:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Nch-0003MB-Q5 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:15 +0000 Received: from [85.158.143.35:26992] by server-2.bemta-4.messagelabs.com id BD/1D-18579-399D7B35; Sat, 05 Jul 2014 10:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1404557713!15985218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30803 invoked from network); 5 Jul 2014 10:55:14 -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; 5 Jul 2014 10:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3Ncf-00028t-A3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3Ncf-0000Bb-7S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 10:55:13 +0000 Date: Sat, 05 Jul 2014 10:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG 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 83c1512e488637286c9a0cf4f58ed85094c15ac2 Author: Ian Jackson AuthorDate: Wed Jul 2 16:06:12 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jul 2 16:06:12 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c2ea4b3..923a697 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.2 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 Jul 05 16:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4M-0000on-HW; Sat, 05 Jul 2014 16:44:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4K-0000oi-LC for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:08 +0000 Received: from [85.158.143.35:32172] by server-1.bemta-4.messagelabs.com id 86/85-09496-75B28B35; Sat, 05 Jul 2014 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404578646!16056400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12175 invoked from network); 5 Jul 2014 16:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4H-0006A3-O7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4H-0002Hs-GA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:05 +0000 Date: Sat, 05 Jul 2014 16:44:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: consolidate and sanitize CR4 guest reserved bit determination X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dab11417da4e21f43625f4ebbb68158f07003d04 Author: Jan Beulich AuthorDate: Wed Jun 25 14:40:34 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:40:34 2014 +0200 x86/HVM: consolidate and sanitize CR4 guest reserved bit determination First of all, this is needed by just a single source file, so it gets moved there instead of getting fed to the compiler for most other source files too. With that it becomes sensible for this to no longer be a macro, allowing elimination of the mostly redundant helpers hvm_vcpu_has_{smep,smap}(). And finally, following the model SMEP and SMAP already used, tie the determination of reserved bits to the features the guest is shown rather than the host's. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 73 +++++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/hvm.h | 57 -------------------------------- 2 files changed, 71 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 17ff011..ef2411c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1723,6 +1723,75 @@ static bool_t hvm_efer_valid(struct domain *d, ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); } +/* These reserved bits in lower 32 remain 0 after any load of CR0 */ +#define HVM_CR0_GUEST_RESERVED_BITS \ + (~((unsigned long) \ + (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | \ + X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | \ + X86_CR0_WP | X86_CR0_AM | X86_CR0_NW | \ + X86_CR0_CD | X86_CR0_PG))) + +/* These bits in CR4 cannot be set by the guest. */ +static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, + bool_t restore) +{ + unsigned int leaf1_ecx = 0, leaf1_edx = 0; + unsigned int leaf7_0_ebx = 0, leaf7_0_ecx = 0; + + if ( likely(!restore) ) + { + unsigned int level; + + ASSERT(v == current); + hvm_cpuid(0, &level, NULL, NULL, NULL); + if ( level >= 1 ) + hvm_cpuid(1, NULL, NULL, &leaf1_ecx, &leaf1_edx); + if ( level >= 7 ) + hvm_cpuid(7, NULL, &leaf7_0_ebx, &leaf7_0_ecx, NULL); + } + else + { + leaf1_edx = boot_cpu_data.x86_capability[X86_FEATURE_VME / 32]; + leaf1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_PCID / 32]; + leaf7_0_ebx = boot_cpu_data.x86_capability[X86_FEATURE_FSGSBASE / 32]; + } + + return ~(unsigned long) + ((leaf1_edx & cpufeat_mask(X86_FEATURE_VME) ? + X86_CR4_VME | X86_CR4_PVI : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_TSC) ? + X86_CR4_TSD : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_DE) ? + X86_CR4_DE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PSE) ? + X86_CR4_PSE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PAE) ? + X86_CR4_PAE : 0) | + (leaf1_edx & (cpufeat_mask(X86_FEATURE_MCE) | + cpufeat_mask(X86_FEATURE_MCA)) ? + X86_CR4_MCE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PGE) ? + X86_CR4_PGE : 0) | + X86_CR4_PCE | + (leaf1_edx & cpufeat_mask(X86_FEATURE_FXSR) ? + X86_CR4_OSFXSR : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_XMM) ? + X86_CR4_OSXMMEXCPT : 0) | + ((restore || nestedhvm_enabled(v->domain)) && + (leaf1_ecx & cpufeat_mask(X86_FEATURE_VMXE)) ? + X86_CR4_VMXE : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_FSGSBASE) ? + X86_CR4_FSGSBASE : 0) | + (leaf1_ecx & cpufeat_mask(X86_FEATURE_PCID) ? + X86_CR4_PCIDE : 0) | + (leaf1_ecx & cpufeat_mask(X86_FEATURE_XSAVE) ? + X86_CR4_OSXSAVE : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMEP) ? + X86_CR4_SMEP : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMAP) ? + X86_CR4_SMAP : 0)); +} + static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) { int vcpuid; @@ -1753,7 +1822,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( ctxt.cr4 & HVM_CR4_GUEST_RESERVED_BITS(v, 1) ) + if ( ctxt.cr4 & hvm_cr4_guest_reserved_bits(v, 1) ) { printk(XENLOG_G_ERR "HVM%d restore: bad CR4 %#" PRIx64 "\n", d->domain_id, ctxt.cr4); @@ -3185,7 +3254,7 @@ int hvm_set_cr4(unsigned long value) struct vcpu *v = current; unsigned long old_cr; - if ( value & HVM_CR4_GUEST_RESERVED_BITS(v, 0) ) + if ( value & hvm_cr4_guest_reserved_bits(v, 0) ) { HVM_DBG_LOG(DBG_LEVEL_1, "Guest attempts to set reserved bit in CR4: %lx", diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 90e69f5..0ebd478 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -367,67 +367,10 @@ static inline int hvm_event_pending(struct vcpu *v) return hvm_funcs.event_pending(v); } -static inline bool_t hvm_vcpu_has_smep(void) -{ - unsigned int eax, ebx, ecx = 0; - - hvm_cpuid(0, &eax, NULL, NULL, NULL); - - if ( eax < 7 ) - return 0; - - hvm_cpuid(7, NULL, &ebx, &ecx, NULL); - return !!(ebx & cpufeat_mask(X86_FEATURE_SMEP)); -} - -static inline bool_t hvm_vcpu_has_smap(void) -{ - unsigned int eax, ebx, ecx = 0; - - hvm_cpuid(0, &eax, NULL, NULL, NULL); - - if ( eax < 7 ) - return 0; - - hvm_cpuid(7, NULL, &ebx, &ecx, NULL); - return !!(ebx & cpufeat_mask(X86_FEATURE_SMAP)); -} - -/* These reserved bits in lower 32 remain 0 after any load of CR0 */ -#define HVM_CR0_GUEST_RESERVED_BITS \ - (~((unsigned long) \ - (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | \ - X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | \ - X86_CR0_WP | X86_CR0_AM | X86_CR0_NW | \ - X86_CR0_CD | X86_CR0_PG))) - /* These bits in CR4 are owned by the host. */ #define HVM_CR4_HOST_MASK (mmu_cr4_features & \ (X86_CR4_VMXE | X86_CR4_PAE | X86_CR4_MCE)) -/* These bits in CR4 cannot be set by the guest. */ -#define HVM_CR4_GUEST_RESERVED_BITS(v, restore) ({ \ - const struct vcpu *_v = (v); \ - bool_t _restore = !!(restore); \ - ASSERT((_restore) || _v == current); \ - (~((unsigned long) \ - (X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | \ - X86_CR4_DE | X86_CR4_PSE | X86_CR4_PAE | \ - X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE | \ - X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT | \ - (((_restore) ? cpu_has_smep : \ - hvm_vcpu_has_smep()) ? \ - X86_CR4_SMEP : 0) | \ - (((_restore) ? cpu_has_smap : \ - hvm_vcpu_has_smap()) ? \ - X86_CR4_SMAP : 0) | \ - (cpu_has_fsgsbase ? X86_CR4_FSGSBASE : 0) | \ - ((nestedhvm_enabled(_v->domain) && cpu_has_vmx) \ - ? X86_CR4_VMXE : 0) | \ - (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))); \ -}) - /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4M-0000on-HW; Sat, 05 Jul 2014 16:44:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4K-0000oi-LC for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:08 +0000 Received: from [85.158.143.35:32172] by server-1.bemta-4.messagelabs.com id 86/85-09496-75B28B35; Sat, 05 Jul 2014 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404578646!16056400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12175 invoked from network); 5 Jul 2014 16:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4H-0006A3-O7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4H-0002Hs-GA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:05 +0000 Date: Sat, 05 Jul 2014 16:44:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: consolidate and sanitize CR4 guest reserved bit determination X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dab11417da4e21f43625f4ebbb68158f07003d04 Author: Jan Beulich AuthorDate: Wed Jun 25 14:40:34 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:40:34 2014 +0200 x86/HVM: consolidate and sanitize CR4 guest reserved bit determination First of all, this is needed by just a single source file, so it gets moved there instead of getting fed to the compiler for most other source files too. With that it becomes sensible for this to no longer be a macro, allowing elimination of the mostly redundant helpers hvm_vcpu_has_{smep,smap}(). And finally, following the model SMEP and SMAP already used, tie the determination of reserved bits to the features the guest is shown rather than the host's. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 73 +++++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/hvm.h | 57 -------------------------------- 2 files changed, 71 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 17ff011..ef2411c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1723,6 +1723,75 @@ static bool_t hvm_efer_valid(struct domain *d, ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); } +/* These reserved bits in lower 32 remain 0 after any load of CR0 */ +#define HVM_CR0_GUEST_RESERVED_BITS \ + (~((unsigned long) \ + (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | \ + X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | \ + X86_CR0_WP | X86_CR0_AM | X86_CR0_NW | \ + X86_CR0_CD | X86_CR0_PG))) + +/* These bits in CR4 cannot be set by the guest. */ +static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, + bool_t restore) +{ + unsigned int leaf1_ecx = 0, leaf1_edx = 0; + unsigned int leaf7_0_ebx = 0, leaf7_0_ecx = 0; + + if ( likely(!restore) ) + { + unsigned int level; + + ASSERT(v == current); + hvm_cpuid(0, &level, NULL, NULL, NULL); + if ( level >= 1 ) + hvm_cpuid(1, NULL, NULL, &leaf1_ecx, &leaf1_edx); + if ( level >= 7 ) + hvm_cpuid(7, NULL, &leaf7_0_ebx, &leaf7_0_ecx, NULL); + } + else + { + leaf1_edx = boot_cpu_data.x86_capability[X86_FEATURE_VME / 32]; + leaf1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_PCID / 32]; + leaf7_0_ebx = boot_cpu_data.x86_capability[X86_FEATURE_FSGSBASE / 32]; + } + + return ~(unsigned long) + ((leaf1_edx & cpufeat_mask(X86_FEATURE_VME) ? + X86_CR4_VME | X86_CR4_PVI : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_TSC) ? + X86_CR4_TSD : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_DE) ? + X86_CR4_DE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PSE) ? + X86_CR4_PSE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PAE) ? + X86_CR4_PAE : 0) | + (leaf1_edx & (cpufeat_mask(X86_FEATURE_MCE) | + cpufeat_mask(X86_FEATURE_MCA)) ? + X86_CR4_MCE : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_PGE) ? + X86_CR4_PGE : 0) | + X86_CR4_PCE | + (leaf1_edx & cpufeat_mask(X86_FEATURE_FXSR) ? + X86_CR4_OSFXSR : 0) | + (leaf1_edx & cpufeat_mask(X86_FEATURE_XMM) ? + X86_CR4_OSXMMEXCPT : 0) | + ((restore || nestedhvm_enabled(v->domain)) && + (leaf1_ecx & cpufeat_mask(X86_FEATURE_VMXE)) ? + X86_CR4_VMXE : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_FSGSBASE) ? + X86_CR4_FSGSBASE : 0) | + (leaf1_ecx & cpufeat_mask(X86_FEATURE_PCID) ? + X86_CR4_PCIDE : 0) | + (leaf1_ecx & cpufeat_mask(X86_FEATURE_XSAVE) ? + X86_CR4_OSXSAVE : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMEP) ? + X86_CR4_SMEP : 0) | + (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMAP) ? + X86_CR4_SMAP : 0)); +} + static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) { int vcpuid; @@ -1753,7 +1822,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( ctxt.cr4 & HVM_CR4_GUEST_RESERVED_BITS(v, 1) ) + if ( ctxt.cr4 & hvm_cr4_guest_reserved_bits(v, 1) ) { printk(XENLOG_G_ERR "HVM%d restore: bad CR4 %#" PRIx64 "\n", d->domain_id, ctxt.cr4); @@ -3185,7 +3254,7 @@ int hvm_set_cr4(unsigned long value) struct vcpu *v = current; unsigned long old_cr; - if ( value & HVM_CR4_GUEST_RESERVED_BITS(v, 0) ) + if ( value & hvm_cr4_guest_reserved_bits(v, 0) ) { HVM_DBG_LOG(DBG_LEVEL_1, "Guest attempts to set reserved bit in CR4: %lx", diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 90e69f5..0ebd478 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -367,67 +367,10 @@ static inline int hvm_event_pending(struct vcpu *v) return hvm_funcs.event_pending(v); } -static inline bool_t hvm_vcpu_has_smep(void) -{ - unsigned int eax, ebx, ecx = 0; - - hvm_cpuid(0, &eax, NULL, NULL, NULL); - - if ( eax < 7 ) - return 0; - - hvm_cpuid(7, NULL, &ebx, &ecx, NULL); - return !!(ebx & cpufeat_mask(X86_FEATURE_SMEP)); -} - -static inline bool_t hvm_vcpu_has_smap(void) -{ - unsigned int eax, ebx, ecx = 0; - - hvm_cpuid(0, &eax, NULL, NULL, NULL); - - if ( eax < 7 ) - return 0; - - hvm_cpuid(7, NULL, &ebx, &ecx, NULL); - return !!(ebx & cpufeat_mask(X86_FEATURE_SMAP)); -} - -/* These reserved bits in lower 32 remain 0 after any load of CR0 */ -#define HVM_CR0_GUEST_RESERVED_BITS \ - (~((unsigned long) \ - (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | \ - X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | \ - X86_CR0_WP | X86_CR0_AM | X86_CR0_NW | \ - X86_CR0_CD | X86_CR0_PG))) - /* These bits in CR4 are owned by the host. */ #define HVM_CR4_HOST_MASK (mmu_cr4_features & \ (X86_CR4_VMXE | X86_CR4_PAE | X86_CR4_MCE)) -/* These bits in CR4 cannot be set by the guest. */ -#define HVM_CR4_GUEST_RESERVED_BITS(v, restore) ({ \ - const struct vcpu *_v = (v); \ - bool_t _restore = !!(restore); \ - ASSERT((_restore) || _v == current); \ - (~((unsigned long) \ - (X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | \ - X86_CR4_DE | X86_CR4_PSE | X86_CR4_PAE | \ - X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE | \ - X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT | \ - (((_restore) ? cpu_has_smep : \ - hvm_vcpu_has_smep()) ? \ - X86_CR4_SMEP : 0) | \ - (((_restore) ? cpu_has_smap : \ - hvm_vcpu_has_smap()) ? \ - X86_CR4_SMAP : 0) | \ - (cpu_has_fsgsbase ? X86_CR4_FSGSBASE : 0) | \ - ((nestedhvm_enabled(_v->domain) && cpu_has_vmx) \ - ? X86_CR4_VMXE : 0) | \ - (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))); \ -}) - /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T4X-0000pL-KU; Sat, 05 Jul 2014 16:44:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4V-0000oz-DJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:19 +0000 Received: from [85.158.143.35:32560] by server-3.bemta-4.messagelabs.com id A6/8C-16194-26B28B35; Sat, 05 Jul 2014 16:44:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404578656!16033570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26529 invoked from network); 5 Jul 2014 16:44: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; 5 Jul 2014 16:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4S-0006A6-4d for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4R-0002Im-S8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:15 +0000 Date: Sat, 05 Jul 2014 16:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/qinval: eliminate redundant 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 ad1546260422378ff4385b7db91a2c8ffa1dca29 Author: Jan Beulich AuthorDate: Wed Jun 25 14:42:15 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:42:15 2014 +0200 VT-d/qinval: eliminate redundant locking The qinval-specific lock would only ever get used with the IOMMU's register lock already held. Along with dropping the lock also drop another unused field from struct qi_ctrl. Furthermore the gen_*_dsc() helpers become pretty pointless with the lock dropped - being each used only in a single place, simply fold them into their callers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 1 - xen/drivers/passthrough/vtd/iommu.h | 2 - xen/drivers/passthrough/vtd/qinval.c | 188 +++++++++++---------------------- 3 files changed, 63 insertions(+), 128 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 500fc3b..042b882 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -147,7 +147,6 @@ static struct intel_iommu *__init alloc_intel_iommu(void) if ( intel == NULL ) return NULL; - spin_lock_init(&intel->qi_ctrl.qinval_lock); spin_lock_init(&intel->ir_ctrl.iremap_lock); return intel; diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 1a1f20a..6b2cf1a 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -487,8 +487,6 @@ extern struct list_head acpi_ioapic_units; struct qi_ctrl { u64 qinval_maddr; /* queue invalidation page machine address */ - int qinval_index; /* queue invalidation index */ - spinlock_t qinval_lock; /* lock for queue invalidation page */ }; struct ir_ctrl { diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index f4155e6..aed8237 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -68,19 +68,21 @@ static void qinval_update_qtail(struct iommu *iommu, unsigned int index) dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); } -static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index, +int queue_invalidate_context(struct iommu *iommu, u16 did, u16 source_id, u8 function_mask, u8 granu) { unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); + unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + spin_lock_irqsave(&iommu->register_lock, flags); + index = qinval_next_index(iommu); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.cc_inv_dsc.lo.type = TYPE_INVAL_CONTEXT; qinval_entry->q.cc_inv_dsc.lo.granu = granu; qinval_entry->q.cc_inv_dsc.lo.res_1 = 0; @@ -90,42 +92,29 @@ static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.cc_inv_dsc.lo.res_2 = 0; qinval_entry->q.cc_inv_dsc.hi.res = 0; + qinval_update_qtail(iommu, index); + spin_unlock_irqrestore(&iommu->register_lock, flags); + unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); return 0; } -int queue_invalidate_context(struct iommu *iommu, - u16 did, u16 source_id, u8 function_mask, u8 granu) +int queue_invalidate_iotlb(struct iommu *iommu, + u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) { - int ret; unsigned long flags; unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_cc_inv_dsc(iommu, index, did, source_id, - function_mask, granu); - qinval_update_qtail(iommu, index); - spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} - -static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.iotlb_inv_dsc.lo.type = TYPE_INVAL_IOTLB; qinval_entry->q.iotlb_inv_dsc.lo.granu = granu; qinval_entry->q.iotlb_inv_dsc.lo.dr = dr; @@ -140,50 +129,9 @@ static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); - return 0; -} - -int queue_invalidate_iotlb(struct iommu *iommu, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) -{ - int ret; - unsigned long flags; - unsigned int index; - - spin_lock_irqsave(&iommu->register_lock, flags); - - index = qinval_next_index(iommu); - ret = gen_iotlb_inv_dsc(iommu, index, granu, dr, dw, did, - am, ih, addr); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} -static int gen_wait_dsc(struct iommu *iommu, unsigned int index, - u8 iflag, u8 sw, u8 fn, u32 sdata, volatile u32 *saddr) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); - qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; - qinval_entry->q.inv_wait_dsc.lo.type = TYPE_INVAL_WAIT; - qinval_entry->q.inv_wait_dsc.lo.iflag = iflag; - qinval_entry->q.inv_wait_dsc.lo.sw = sw; - qinval_entry->q.inv_wait_dsc.lo.fn = fn; - qinval_entry->q.inv_wait_dsc.lo.res_1 = 0; - qinval_entry->q.inv_wait_dsc.lo.sdata = sdata; - qinval_entry->q.inv_wait_dsc.hi.res_1 = 0; - qinval_entry->q.inv_wait_dsc.hi.saddr = virt_to_maddr(saddr) >> 2; - unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); return 0; } @@ -193,12 +141,27 @@ static int queue_invalidate_wait(struct iommu *iommu, s_time_t start_time; volatile u32 poll_slot = QINVAL_STAT_INIT; unsigned int index; - int ret; unsigned long flags; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_wait_dsc(iommu, index, iflag, sw, fn, QINVAL_STAT_DONE, &poll_slot); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); + qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + + qinval_entry->q.inv_wait_dsc.lo.type = TYPE_INVAL_WAIT; + qinval_entry->q.inv_wait_dsc.lo.iflag = iflag; + qinval_entry->q.inv_wait_dsc.lo.sw = sw; + qinval_entry->q.inv_wait_dsc.lo.fn = fn; + qinval_entry->q.inv_wait_dsc.lo.res_1 = 0; + qinval_entry->q.inv_wait_dsc.lo.sdata = QINVAL_STAT_DONE; + qinval_entry->q.inv_wait_dsc.hi.res_1 = 0; + qinval_entry->q.inv_wait_dsc.hi.saddr = virt_to_maddr(&poll_slot) >> 2; + + unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); @@ -216,10 +179,10 @@ static int queue_invalidate_wait(struct iommu *iommu, } cpu_relax(); } + return 0; } - else if ( !ret ) - ret = -EOPNOTSUPP; - return ret; + + return -EOPNOTSUPP; } static int invalidate_sync(struct iommu *iommu) @@ -231,20 +194,21 @@ static int invalidate_sync(struct iommu *iommu) return 0; } -static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, +int qinval_device_iotlb(struct iommu *iommu, u32 max_invs_pend, u16 sid, u16 size, u64 addr) { unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); + unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + spin_lock_irqsave(&iommu->register_lock, flags); + index = qinval_next_index(iommu); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.dev_iotlb_inv_dsc.lo.type = TYPE_INVAL_DEVICE_IOTLB; qinval_entry->q.dev_iotlb_inv_dsc.lo.res_1 = 0; qinval_entry->q.dev_iotlb_inv_dsc.lo.max_invs_pend = max_invs_pend; @@ -257,40 +221,26 @@ static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.dev_iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); + qinval_update_qtail(iommu, index); + spin_unlock_irqrestore(&iommu->register_lock, flags); + return 0; } -int qinval_device_iotlb(struct iommu *iommu, - u32 max_invs_pend, u16 sid, u16 size, u64 addr) +int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { - int ret; unsigned long flags; unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_dev_iotlb_inv_dsc(iommu, index, max_invs_pend, - sid, size, addr); - qinval_update_qtail(iommu, index); - spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} - -static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index, - u8 granu, u8 im, u16 iidx) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.iec_inv_dsc.lo.type = TYPE_INVAL_IEC; qinval_entry->q.iec_inv_dsc.lo.granu = granu; qinval_entry->q.iec_inv_dsc.lo.res_1 = 0; @@ -300,22 +250,10 @@ static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.iec_inv_dsc.hi.res = 0; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); - return 0; -} - -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) -{ - int ret; - unsigned long flags; - unsigned int index; - - spin_lock_irqsave(&iommu->register_lock, flags); - index = qinval_next_index(iommu); - ret = gen_iec_inv_dsc(iommu, index, granu, im, iidx); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; + + return 0; } static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T4X-0000pL-KU; Sat, 05 Jul 2014 16:44:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4V-0000oz-DJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:19 +0000 Received: from [85.158.143.35:32560] by server-3.bemta-4.messagelabs.com id A6/8C-16194-26B28B35; Sat, 05 Jul 2014 16:44:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404578656!16033570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26529 invoked from network); 5 Jul 2014 16:44: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; 5 Jul 2014 16:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4S-0006A6-4d for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4R-0002Im-S8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:15 +0000 Date: Sat, 05 Jul 2014 16:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/qinval: eliminate redundant 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 ad1546260422378ff4385b7db91a2c8ffa1dca29 Author: Jan Beulich AuthorDate: Wed Jun 25 14:42:15 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:42:15 2014 +0200 VT-d/qinval: eliminate redundant locking The qinval-specific lock would only ever get used with the IOMMU's register lock already held. Along with dropping the lock also drop another unused field from struct qi_ctrl. Furthermore the gen_*_dsc() helpers become pretty pointless with the lock dropped - being each used only in a single place, simply fold them into their callers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 1 - xen/drivers/passthrough/vtd/iommu.h | 2 - xen/drivers/passthrough/vtd/qinval.c | 188 +++++++++++---------------------- 3 files changed, 63 insertions(+), 128 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 500fc3b..042b882 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -147,7 +147,6 @@ static struct intel_iommu *__init alloc_intel_iommu(void) if ( intel == NULL ) return NULL; - spin_lock_init(&intel->qi_ctrl.qinval_lock); spin_lock_init(&intel->ir_ctrl.iremap_lock); return intel; diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 1a1f20a..6b2cf1a 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -487,8 +487,6 @@ extern struct list_head acpi_ioapic_units; struct qi_ctrl { u64 qinval_maddr; /* queue invalidation page machine address */ - int qinval_index; /* queue invalidation index */ - spinlock_t qinval_lock; /* lock for queue invalidation page */ }; struct ir_ctrl { diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index f4155e6..aed8237 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -68,19 +68,21 @@ static void qinval_update_qtail(struct iommu *iommu, unsigned int index) dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); } -static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index, +int queue_invalidate_context(struct iommu *iommu, u16 did, u16 source_id, u8 function_mask, u8 granu) { unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); + unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + spin_lock_irqsave(&iommu->register_lock, flags); + index = qinval_next_index(iommu); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.cc_inv_dsc.lo.type = TYPE_INVAL_CONTEXT; qinval_entry->q.cc_inv_dsc.lo.granu = granu; qinval_entry->q.cc_inv_dsc.lo.res_1 = 0; @@ -90,42 +92,29 @@ static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.cc_inv_dsc.lo.res_2 = 0; qinval_entry->q.cc_inv_dsc.hi.res = 0; + qinval_update_qtail(iommu, index); + spin_unlock_irqrestore(&iommu->register_lock, flags); + unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); return 0; } -int queue_invalidate_context(struct iommu *iommu, - u16 did, u16 source_id, u8 function_mask, u8 granu) +int queue_invalidate_iotlb(struct iommu *iommu, + u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) { - int ret; unsigned long flags; unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_cc_inv_dsc(iommu, index, did, source_id, - function_mask, granu); - qinval_update_qtail(iommu, index); - spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} - -static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.iotlb_inv_dsc.lo.type = TYPE_INVAL_IOTLB; qinval_entry->q.iotlb_inv_dsc.lo.granu = granu; qinval_entry->q.iotlb_inv_dsc.lo.dr = dr; @@ -140,50 +129,9 @@ static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); - return 0; -} - -int queue_invalidate_iotlb(struct iommu *iommu, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) -{ - int ret; - unsigned long flags; - unsigned int index; - - spin_lock_irqsave(&iommu->register_lock, flags); - - index = qinval_next_index(iommu); - ret = gen_iotlb_inv_dsc(iommu, index, granu, dr, dw, did, - am, ih, addr); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} -static int gen_wait_dsc(struct iommu *iommu, unsigned int index, - u8 iflag, u8 sw, u8 fn, u32 sdata, volatile u32 *saddr) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); - qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; - qinval_entry->q.inv_wait_dsc.lo.type = TYPE_INVAL_WAIT; - qinval_entry->q.inv_wait_dsc.lo.iflag = iflag; - qinval_entry->q.inv_wait_dsc.lo.sw = sw; - qinval_entry->q.inv_wait_dsc.lo.fn = fn; - qinval_entry->q.inv_wait_dsc.lo.res_1 = 0; - qinval_entry->q.inv_wait_dsc.lo.sdata = sdata; - qinval_entry->q.inv_wait_dsc.hi.res_1 = 0; - qinval_entry->q.inv_wait_dsc.hi.saddr = virt_to_maddr(saddr) >> 2; - unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); return 0; } @@ -193,12 +141,27 @@ static int queue_invalidate_wait(struct iommu *iommu, s_time_t start_time; volatile u32 poll_slot = QINVAL_STAT_INIT; unsigned int index; - int ret; unsigned long flags; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_wait_dsc(iommu, index, iflag, sw, fn, QINVAL_STAT_DONE, &poll_slot); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); + qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + + qinval_entry->q.inv_wait_dsc.lo.type = TYPE_INVAL_WAIT; + qinval_entry->q.inv_wait_dsc.lo.iflag = iflag; + qinval_entry->q.inv_wait_dsc.lo.sw = sw; + qinval_entry->q.inv_wait_dsc.lo.fn = fn; + qinval_entry->q.inv_wait_dsc.lo.res_1 = 0; + qinval_entry->q.inv_wait_dsc.lo.sdata = QINVAL_STAT_DONE; + qinval_entry->q.inv_wait_dsc.hi.res_1 = 0; + qinval_entry->q.inv_wait_dsc.hi.saddr = virt_to_maddr(&poll_slot) >> 2; + + unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); @@ -216,10 +179,10 @@ static int queue_invalidate_wait(struct iommu *iommu, } cpu_relax(); } + return 0; } - else if ( !ret ) - ret = -EOPNOTSUPP; - return ret; + + return -EOPNOTSUPP; } static int invalidate_sync(struct iommu *iommu) @@ -231,20 +194,21 @@ static int invalidate_sync(struct iommu *iommu) return 0; } -static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, +int qinval_device_iotlb(struct iommu *iommu, u32 max_invs_pend, u16 sid, u16 size, u64 addr) { unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); + unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + spin_lock_irqsave(&iommu->register_lock, flags); + index = qinval_next_index(iommu); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.dev_iotlb_inv_dsc.lo.type = TYPE_INVAL_DEVICE_IOTLB; qinval_entry->q.dev_iotlb_inv_dsc.lo.res_1 = 0; qinval_entry->q.dev_iotlb_inv_dsc.lo.max_invs_pend = max_invs_pend; @@ -257,40 +221,26 @@ static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.dev_iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); + qinval_update_qtail(iommu, index); + spin_unlock_irqrestore(&iommu->register_lock, flags); + return 0; } -int qinval_device_iotlb(struct iommu *iommu, - u32 max_invs_pend, u16 sid, u16 size, u64 addr) +int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { - int ret; unsigned long flags; unsigned int index; + u64 entry_base; + struct qinval_entry *qinval_entry, *qinval_entries; spin_lock_irqsave(&iommu->register_lock, flags); index = qinval_next_index(iommu); - ret = gen_dev_iotlb_inv_dsc(iommu, index, max_invs_pend, - sid, size, addr); - qinval_update_qtail(iommu, index); - spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; -} - -static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index, - u8 granu, u8 im, u16 iidx) -{ - unsigned long flags; - struct qinval_entry *qinval_entry = NULL, *qinval_entries; - struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu); - u64 entry_base = qi_ctrl->qinval_maddr + - (( index >> QINVAL_ENTRY_ORDER ) << PAGE_SHIFT ); - - spin_lock_irqsave(&qi_ctrl->qinval_lock, flags); - - qinval_entries = - (struct qinval_entry *)map_vtd_domain_page(entry_base); + entry_base = iommu_qi_ctrl(iommu)->qinval_maddr + + ((index >> QINVAL_ENTRY_ORDER) << PAGE_SHIFT); + qinval_entries = map_vtd_domain_page(entry_base); qinval_entry = &qinval_entries[index % (1 << QINVAL_ENTRY_ORDER)]; + qinval_entry->q.iec_inv_dsc.lo.type = TYPE_INVAL_IEC; qinval_entry->q.iec_inv_dsc.lo.granu = granu; qinval_entry->q.iec_inv_dsc.lo.res_1 = 0; @@ -300,22 +250,10 @@ static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index, qinval_entry->q.iec_inv_dsc.hi.res = 0; unmap_vtd_domain_page(qinval_entries); - spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); - return 0; -} - -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) -{ - int ret; - unsigned long flags; - unsigned int index; - - spin_lock_irqsave(&iommu->register_lock, flags); - index = qinval_next_index(iommu); - ret = gen_iec_inv_dsc(iommu, index, granu, im, iidx); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - return ret; + + return 0; } static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4g-0000qZ-NP; Sat, 05 Jul 2014 16:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4f-0000qJ-GL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:29 +0000 Received: from [85.158.137.68:52447] by server-12.bemta-3.messagelabs.com id 97/30-12714-C6B28B35; Sat, 05 Jul 2014 16:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404578666!14166166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 379 invoked from network); 5 Jul 2014 16:44:27 -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; 5 Jul 2014 16:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4c-0006AF-BB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4c-0002J8-9Q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:26 +0000 Date: Sat, 05 Jul 2014 16:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] slightly consolidate code in free_domheap_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 daa4b800d29ff2486242c0136b21badf37495ba1 Author: Jan Beulich AuthorDate: Wed Jun 25 14:43:04 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:43:04 2014 +0200 slightly consolidate code in free_domheap_pages() ... to combine the three scrubbing paths into a single one. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/page_alloc.c | 65 +++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 58677d0..7b4092d 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1724,47 +1724,52 @@ void free_domheap_pages(struct page_info *pg, unsigned int order) spin_unlock_recursive(&d->page_alloc_lock); } - else if ( likely(d != NULL) && likely(d != dom_cow) ) + else { - /* NB. May recursively lock from relinquish_memory(). */ - spin_lock_recursive(&d->page_alloc_lock); + bool_t scrub; - for ( i = 0; i < (1 << order); i++ ) + if ( likely(d) && likely(d != dom_cow) ) { - BUG_ON((pg[i].u.inuse.type_info & PGT_count_mask) != 0); - page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); - } + /* NB. May recursively lock from relinquish_memory(). */ + spin_lock_recursive(&d->page_alloc_lock); - drop_dom_ref = !domain_adjust_tot_pages(d, -(1 << order)); + for ( i = 0; i < (1 << order); i++ ) + { + BUG_ON((pg[i].u.inuse.type_info & PGT_count_mask) != 0); + page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); + } - spin_unlock_recursive(&d->page_alloc_lock); + drop_dom_ref = !domain_adjust_tot_pages(d, -(1 << order)); - /* - * Normally we expect a domain to clear pages before freeing them, if - * it cares about the secrecy of their contents. However, after a - * domain has died we assume responsibility for erasure. - */ - if ( unlikely(d->is_dying) ) + spin_unlock_recursive(&d->page_alloc_lock); + + /* + * Normally we expect a domain to clear pages before freeing them, + * if it cares about the secrecy of their contents. However, after + * a domain has died we assume responsibility for erasure. + */ + scrub = !!d->is_dying; + } + else + { + /* + * All we need to check is that on dom_cow only order-0 chunks + * make it here. Due to the if() above, the only two possible + * cases right now are d == NULL and d == dom_cow. To protect + * against relaxation of that if() condition without updating the + * check here, don't check d != dom_cow for now. + */ + ASSERT(!d || !order); + drop_dom_ref = 0; + scrub = 1; + } + + if ( unlikely(scrub) ) for ( i = 0; i < (1 << order); i++ ) scrub_one_page(&pg[i]); free_heap_pages(pg, order); } - else if ( unlikely(d == dom_cow) ) - { - ASSERT(order == 0); - scrub_one_page(pg); - free_heap_pages(pg, 0); - drop_dom_ref = 0; - } - else - { - /* Freeing anonymous domain-heap pages. */ - for ( i = 0; i < (1 << order); i++ ) - scrub_one_page(&pg[i]); - free_heap_pages(pg, order); - drop_dom_ref = 0; - } if ( drop_dom_ref ) put_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 Jul 05 16:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4g-0000qZ-NP; Sat, 05 Jul 2014 16:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4f-0000qJ-GL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:29 +0000 Received: from [85.158.137.68:52447] by server-12.bemta-3.messagelabs.com id 97/30-12714-C6B28B35; Sat, 05 Jul 2014 16:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404578666!14166166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 379 invoked from network); 5 Jul 2014 16:44:27 -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; 5 Jul 2014 16:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4c-0006AF-BB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4c-0002J8-9Q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:26 +0000 Date: Sat, 05 Jul 2014 16:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] slightly consolidate code in free_domheap_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 daa4b800d29ff2486242c0136b21badf37495ba1 Author: Jan Beulich AuthorDate: Wed Jun 25 14:43:04 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:43:04 2014 +0200 slightly consolidate code in free_domheap_pages() ... to combine the three scrubbing paths into a single one. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/page_alloc.c | 65 +++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 58677d0..7b4092d 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1724,47 +1724,52 @@ void free_domheap_pages(struct page_info *pg, unsigned int order) spin_unlock_recursive(&d->page_alloc_lock); } - else if ( likely(d != NULL) && likely(d != dom_cow) ) + else { - /* NB. May recursively lock from relinquish_memory(). */ - spin_lock_recursive(&d->page_alloc_lock); + bool_t scrub; - for ( i = 0; i < (1 << order); i++ ) + if ( likely(d) && likely(d != dom_cow) ) { - BUG_ON((pg[i].u.inuse.type_info & PGT_count_mask) != 0); - page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); - } + /* NB. May recursively lock from relinquish_memory(). */ + spin_lock_recursive(&d->page_alloc_lock); - drop_dom_ref = !domain_adjust_tot_pages(d, -(1 << order)); + for ( i = 0; i < (1 << order); i++ ) + { + BUG_ON((pg[i].u.inuse.type_info & PGT_count_mask) != 0); + page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); + } - spin_unlock_recursive(&d->page_alloc_lock); + drop_dom_ref = !domain_adjust_tot_pages(d, -(1 << order)); - /* - * Normally we expect a domain to clear pages before freeing them, if - * it cares about the secrecy of their contents. However, after a - * domain has died we assume responsibility for erasure. - */ - if ( unlikely(d->is_dying) ) + spin_unlock_recursive(&d->page_alloc_lock); + + /* + * Normally we expect a domain to clear pages before freeing them, + * if it cares about the secrecy of their contents. However, after + * a domain has died we assume responsibility for erasure. + */ + scrub = !!d->is_dying; + } + else + { + /* + * All we need to check is that on dom_cow only order-0 chunks + * make it here. Due to the if() above, the only two possible + * cases right now are d == NULL and d == dom_cow. To protect + * against relaxation of that if() condition without updating the + * check here, don't check d != dom_cow for now. + */ + ASSERT(!d || !order); + drop_dom_ref = 0; + scrub = 1; + } + + if ( unlikely(scrub) ) for ( i = 0; i < (1 << order); i++ ) scrub_one_page(&pg[i]); free_heap_pages(pg, order); } - else if ( unlikely(d == dom_cow) ) - { - ASSERT(order == 0); - scrub_one_page(pg); - free_heap_pages(pg, 0); - drop_dom_ref = 0; - } - else - { - /* Freeing anonymous domain-heap pages. */ - for ( i = 0; i < (1 << order); i++ ) - scrub_one_page(&pg[i]); - free_heap_pages(pg, order); - drop_dom_ref = 0; - } if ( drop_dom_ref ) put_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 Jul 05 16:44:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4q-0000sK-Ri; Sat, 05 Jul 2014 16:44:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4p-0000s1-DI for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:39 +0000 Received: from [85.158.143.35:35240] by server-3.bemta-4.messagelabs.com id 48/9C-16194-67B28B35; Sat, 05 Jul 2014 16:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404578676!7997514!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11401 invoked from network); 5 Jul 2014 16:44:37 -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 Jul 2014 16:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4m-0006AN-MZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4m-0002JY-Ed for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:36 +0000 Date: Sat, 05 Jul 2014 16:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/qinval: make further functions static X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e7acfd1b4790623766e05e5b6aa6df155b27bc9 Author: Jan Beulich AuthorDate: Wed Jun 25 14:43:46 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:43:46 2014 +0200 VT-d/qinval: make further functions static ... and with that change their return types to void as they can't actually fail, simplifying error handling in their callers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/extern.h | 6 ----- xen/drivers/passthrough/vtd/qinval.c | 36 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index e9268ef..5524dba 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr, unsigned long npages); int iommu_alloc(struct acpi_drhd_unit *drhd); void iommu_free(struct acpi_drhd_unit *drhd); -int queue_invalidate_context(struct iommu *iommu, - u16 did, u16 source_id, u8 function_mask, u8 granu); -int queue_invalidate_iotlb(struct iommu *iommu, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr); -int queue_invalidate_iec(struct iommu *iommu, - u8 granu, u8 im, u16 iidx); int iommu_flush_iec_global(struct iommu *iommu); int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx); void clear_fault_bits(struct iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index aed8237..4603020 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -68,7 +68,7 @@ static void qinval_update_qtail(struct iommu *iommu, unsigned int index) dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); } -int queue_invalidate_context(struct iommu *iommu, +static void queue_invalidate_context(struct iommu *iommu, u16 did, u16 source_id, u8 function_mask, u8 granu) { unsigned long flags; @@ -96,11 +96,9 @@ int queue_invalidate_context(struct iommu *iommu, spin_unlock_irqrestore(&iommu->register_lock, flags); unmap_vtd_domain_page(qinval_entries); - - return 0; } -int queue_invalidate_iotlb(struct iommu *iommu, +static void queue_invalidate_iotlb(struct iommu *iommu, u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) { unsigned long flags; @@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu *iommu, unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - - return 0; } static int queue_invalidate_wait(struct iommu *iommu, @@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *iommu, return 0; } -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) +static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { unsigned long flags; unsigned int index; @@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - - return 0; } static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { - int ret = queue_invalidate_iec(iommu, granu, im, iidx); - int rc = invalidate_sync(iommu); + int ret; + queue_invalidate_iec(iommu, granu, im, iidx); + ret = invalidate_sync(iommu); /* * reading vt-d architecture register will ensure * draining happens in implementation independent way. */ (void)dmar_readq(iommu->reg, DMAR_CAP_REG); - return ret ?: rc; + + return ret; } int iommu_flush_iec_global(struct iommu *iommu) @@ -303,13 +299,9 @@ static int flush_context_qi( if ( qi_ctrl->qinval_maddr != 0 ) { - int rc; - - ret = queue_invalidate_context(iommu, did, sid, fm, - type >> DMA_CCMD_INVL_GRANU_OFFSET); - rc = invalidate_sync(iommu); - if ( !ret ) - ret = rc; + queue_invalidate_context(iommu, did, sid, fm, + type >> DMA_CCMD_INVL_GRANU_OFFSET); + ret = invalidate_sync(iommu); } return ret; } @@ -348,9 +340,9 @@ static int flush_iotlb_qi( if (cap_read_drain(iommu->cap)) dr = 1; /* Need to conside the ih bit later */ - ret = queue_invalidate_iotlb(iommu, - (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr, - dw, did, (u8)size_order, 0, addr); + queue_invalidate_iotlb(iommu, + type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr, + dw, did, size_order, 0, addr); if ( flush_dev_iotlb ) ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type); rc = invalidate_sync(iommu); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T4q-0000sK-Ri; Sat, 05 Jul 2014 16:44:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4p-0000s1-DI for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:39 +0000 Received: from [85.158.143.35:35240] by server-3.bemta-4.messagelabs.com id 48/9C-16194-67B28B35; Sat, 05 Jul 2014 16:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404578676!7997514!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11401 invoked from network); 5 Jul 2014 16:44:37 -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 Jul 2014 16:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4m-0006AN-MZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4m-0002JY-Ed for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:36 +0000 Date: Sat, 05 Jul 2014 16:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/qinval: make further functions static X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e7acfd1b4790623766e05e5b6aa6df155b27bc9 Author: Jan Beulich AuthorDate: Wed Jun 25 14:43:46 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jun 25 14:43:46 2014 +0200 VT-d/qinval: make further functions static ... and with that change their return types to void as they can't actually fail, simplifying error handling in their callers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/extern.h | 6 ----- xen/drivers/passthrough/vtd/qinval.c | 36 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index e9268ef..5524dba 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr, unsigned long npages); int iommu_alloc(struct acpi_drhd_unit *drhd); void iommu_free(struct acpi_drhd_unit *drhd); -int queue_invalidate_context(struct iommu *iommu, - u16 did, u16 source_id, u8 function_mask, u8 granu); -int queue_invalidate_iotlb(struct iommu *iommu, - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr); -int queue_invalidate_iec(struct iommu *iommu, - u8 granu, u8 im, u16 iidx); int iommu_flush_iec_global(struct iommu *iommu); int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx); void clear_fault_bits(struct iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index aed8237..4603020 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -68,7 +68,7 @@ static void qinval_update_qtail(struct iommu *iommu, unsigned int index) dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); } -int queue_invalidate_context(struct iommu *iommu, +static void queue_invalidate_context(struct iommu *iommu, u16 did, u16 source_id, u8 function_mask, u8 granu) { unsigned long flags; @@ -96,11 +96,9 @@ int queue_invalidate_context(struct iommu *iommu, spin_unlock_irqrestore(&iommu->register_lock, flags); unmap_vtd_domain_page(qinval_entries); - - return 0; } -int queue_invalidate_iotlb(struct iommu *iommu, +static void queue_invalidate_iotlb(struct iommu *iommu, u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) { unsigned long flags; @@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu *iommu, unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - - return 0; } static int queue_invalidate_wait(struct iommu *iommu, @@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *iommu, return 0; } -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) +static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { unsigned long flags; unsigned int index; @@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) unmap_vtd_domain_page(qinval_entries); qinval_update_qtail(iommu, index); spin_unlock_irqrestore(&iommu->register_lock, flags); - - return 0; } static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx) { - int ret = queue_invalidate_iec(iommu, granu, im, iidx); - int rc = invalidate_sync(iommu); + int ret; + queue_invalidate_iec(iommu, granu, im, iidx); + ret = invalidate_sync(iommu); /* * reading vt-d architecture register will ensure * draining happens in implementation independent way. */ (void)dmar_readq(iommu->reg, DMAR_CAP_REG); - return ret ?: rc; + + return ret; } int iommu_flush_iec_global(struct iommu *iommu) @@ -303,13 +299,9 @@ static int flush_context_qi( if ( qi_ctrl->qinval_maddr != 0 ) { - int rc; - - ret = queue_invalidate_context(iommu, did, sid, fm, - type >> DMA_CCMD_INVL_GRANU_OFFSET); - rc = invalidate_sync(iommu); - if ( !ret ) - ret = rc; + queue_invalidate_context(iommu, did, sid, fm, + type >> DMA_CCMD_INVL_GRANU_OFFSET); + ret = invalidate_sync(iommu); } return ret; } @@ -348,9 +340,9 @@ static int flush_iotlb_qi( if (cap_read_drain(iommu->cap)) dr = 1; /* Need to conside the ih bit later */ - ret = queue_invalidate_iotlb(iommu, - (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr, - dw, did, (u8)size_order, 0, addr); + queue_invalidate_iotlb(iommu, + type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr, + dw, did, size_order, 0, addr); if ( flush_dev_iotlb ) ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type); rc = invalidate_sync(iommu); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:44:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T51-0000uW-Uh; Sat, 05 Jul 2014 16:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4z-0000u4-UH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:50 +0000 Received: from [85.158.139.211:44567] by server-12.bemta-5.messagelabs.com id 47/BB-27841-18B28B35; Sat, 05 Jul 2014 16:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404578687!13866473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26645 invoked from network); 5 Jul 2014 16:44: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; 5 Jul 2014 16:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4w-0006AT-Rw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4w-0002Jv-QM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:46 +0000 Date: Sat, 05 Jul 2014 16:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: initialise the grant_table_gpfn array on allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cf5ff44a38b36a316b506758dbf6887de0e4a56 Author: Ian Campbell AuthorDate: Wed Jun 25 13:58:59 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jun 25 14:00:02 2014 +0100 xen: arm: initialise the grant_table_gpfn array on allocation Avoids leaking uninitialised memory via the grant table setup hypercall. This is XSA-101. Reported-by: Julien Grall Signed-off-by: Ian Campbell --- xen/arch/arm/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index e20ba0b..437885d 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -394,7 +394,7 @@ struct domain *alloc_domain_struct(void) return NULL; clear_page(d); - d->arch.grant_table_gpfn = xmalloc_array(xen_pfn_t, max_nr_grant_frames); + d->arch.grant_table_gpfn = xzalloc_array(xen_pfn_t, max_nr_grant_frames); return 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 Jul 05 16:44:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:44: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 1X3T51-0000uW-Uh; Sat, 05 Jul 2014 16:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4z-0000u4-UH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:50 +0000 Received: from [85.158.139.211:44567] by server-12.bemta-5.messagelabs.com id 47/BB-27841-18B28B35; Sat, 05 Jul 2014 16:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404578687!13866473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26645 invoked from network); 5 Jul 2014 16:44: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; 5 Jul 2014 16:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T4w-0006AT-Rw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T4w-0002Jv-QM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:46 +0000 Date: Sat, 05 Jul 2014 16:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: initialise the grant_table_gpfn array on allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cf5ff44a38b36a316b506758dbf6887de0e4a56 Author: Ian Campbell AuthorDate: Wed Jun 25 13:58:59 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jun 25 14:00:02 2014 +0100 xen: arm: initialise the grant_table_gpfn array on allocation Avoids leaking uninitialised memory via the grant table setup hypercall. This is XSA-101. Reported-by: Julien Grall Signed-off-by: Ian Campbell --- xen/arch/arm/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index e20ba0b..437885d 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -394,7 +394,7 @@ struct domain *alloc_domain_struct(void) return NULL; clear_page(d); - d->arch.grant_table_gpfn = xmalloc_array(xen_pfn_t, max_nr_grant_frames); + d->arch.grant_table_gpfn = xzalloc_array(xen_pfn_t, max_nr_grant_frames); return 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 Jul 05 16:45:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T5A-0000w4-25; Sat, 05 Jul 2014 16:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T59-0000vt-Jg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:59 +0000 Received: from [193.109.254.147:51421] by server-2.bemta-14.messagelabs.com id D3/84-30377-A8B28B35; Sat, 05 Jul 2014 16:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404578697!11028291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1288 invoked from network); 5 Jul 2014 16:44:58 -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; 5 Jul 2014 16:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T57-0006Ac-1A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T56-0002KH-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:57 +0000 Date: Sat, 05 Jul 2014 16:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG 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 1c9d2acad014e997771c09d75bc071db754d2f4b Author: Ian Jackson AuthorDate: Wed Jun 25 15:58:02 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jun 25 15:58:02 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 5e03e87..e7f14ef 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 7f5b3c338e0f8938ba575dec18255dcbee0c2ee2 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:45:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T5A-0000w4-25; Sat, 05 Jul 2014 16:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T59-0000vt-Jg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:59 +0000 Received: from [193.109.254.147:51421] by server-2.bemta-14.messagelabs.com id D3/84-30377-A8B28B35; Sat, 05 Jul 2014 16:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404578697!11028291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1288 invoked from network); 5 Jul 2014 16:44:58 -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; 5 Jul 2014 16:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T57-0006Ac-1A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T56-0002KH-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:44:57 +0000 Date: Sat, 05 Jul 2014 16:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG 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 1c9d2acad014e997771c09d75bc071db754d2f4b Author: Ian Jackson AuthorDate: Wed Jun 25 15:58:02 2014 +0100 Commit: Ian Jackson CommitDate: Wed Jun 25 15:58:02 2014 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 5e03e87..e7f14ef 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 7f5b3c338e0f8938ba575dec18255dcbee0c2ee2 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 +# Tue Apr 8 16:50:06 2014 +0000 +# qemu-xen-trad: free all the pirqs for msi/msix when driver unloads # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T5V-0000yY-55; Sat, 05 Jul 2014 16: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 1X3T5U-0000yQ-II for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:20 +0000 Received: from [85.158.137.68:38198] by server-2.bemta-3.messagelabs.com id C7/38-14008-F9B28B35; Sat, 05 Jul 2014 16:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404578717!10496709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23152 invoked from network); 5 Jul 2014 16:45:18 -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 Jul 2014 16:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5R-0006Bd-Gd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5H-0002Lk-5B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:07 +0000 Date: Sat, 05 Jul 2014 16:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make sure gcc doesn't use floating-point registers on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0726c18e8135f87a5a5793d993d6bea1e3fa925 Author: Ian Campbell AuthorDate: Thu Jun 26 17:30:14 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:03:46 2014 +0100 xen: arm: make sure gcc doesn't use floating-point registers on arm64 By using -mgeneral-regs-only which is the Aarch64 equivalent to -msoft-float. Otherwise gcc will corrupt the d* registers, which we don't save/restore when trapping to/from the hypervisor. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 76b35d9..b5bf5cb 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -28,6 +28,7 @@ endif ifeq ($(TARGET_SUBARCH),arm64) CFLAGS += -mcpu=generic +CFLAGS += -mgeneral-regs-only # No fp registers etc arm32 := n arm64 := y 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 Jul 05 16:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3T5V-0000yY-55; Sat, 05 Jul 2014 16: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 1X3T5U-0000yQ-II for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:20 +0000 Received: from [85.158.137.68:38198] by server-2.bemta-3.messagelabs.com id C7/38-14008-F9B28B35; Sat, 05 Jul 2014 16:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404578717!10496709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23152 invoked from network); 5 Jul 2014 16:45:18 -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 Jul 2014 16:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5R-0006Bd-Gd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5H-0002Lk-5B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:07 +0000 Date: Sat, 05 Jul 2014 16:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make sure gcc doesn't use floating-point registers on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0726c18e8135f87a5a5793d993d6bea1e3fa925 Author: Ian Campbell AuthorDate: Thu Jun 26 17:30:14 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:03:46 2014 +0100 xen: arm: make sure gcc doesn't use floating-point registers on arm64 By using -mgeneral-regs-only which is the Aarch64 equivalent to -msoft-float. Otherwise gcc will corrupt the d* registers, which we don't save/restore when trapping to/from the hypervisor. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 76b35d9..b5bf5cb 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -28,6 +28,7 @@ endif ifeq ($(TARGET_SUBARCH),arm64) CFLAGS += -mcpu=generic +CFLAGS += -mgeneral-regs-only # No fp registers etc arm32 := n arm64 := y 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 Jul 05 16:45:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T5f-0000ze-G7; Sat, 05 Jul 2014 16:45:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5e-0000zS-JH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:30 +0000 Received: from [85.158.137.68:38442] by server-13.bemta-3.messagelabs.com id 7E/8F-20015-9AB28B35; Sat, 05 Jul 2014 16:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1404578728!14105721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19831 invoked from network); 5 Jul 2014 16:45:29 -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 Jul 2014 16:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5b-0006Bj-MZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5b-0002M8-KS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:27 +0000 Date: Sat, 05 Jul 2014 16:45:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4bb74e39987b428429c2aacad7f59356d4942e39 Author: Ian Campbell AuthorDate: Thu Jun 26 09:53:42 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:04:35 2014 +0100 xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO As with HCR_EL2.{IMO,AMO} we want to route FIQs to Xen not the guest. See ARM ARM DDI 0406C.b B1.8.4. So far none of the platforms which we support use FIQ for anything, but when we end up supporting one it would be far better to surprise Xen with them than whatever guest happens to be running... Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7f77c56..9bc3198 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -89,8 +89,8 @@ void __cpuinit init_traps(void) CPTR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| - HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| + HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, 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 Sat Jul 05 16:45:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T5f-0000ze-G7; Sat, 05 Jul 2014 16:45:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5e-0000zS-JH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:30 +0000 Received: from [85.158.137.68:38442] by server-13.bemta-3.messagelabs.com id 7E/8F-20015-9AB28B35; Sat, 05 Jul 2014 16:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1404578728!14105721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19831 invoked from network); 5 Jul 2014 16:45:29 -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 Jul 2014 16:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5b-0006Bj-MZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5b-0002M8-KS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:27 +0000 Date: Sat, 05 Jul 2014 16:45:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4bb74e39987b428429c2aacad7f59356d4942e39 Author: Ian Campbell AuthorDate: Thu Jun 26 09:53:42 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:04:35 2014 +0100 xen: arm: take FIQ exceptions to Xen not guest by setting HCR_EL2.FMO As with HCR_EL2.{IMO,AMO} we want to route FIQs to Xen not the guest. See ARM ARM DDI 0406C.b B1.8.4. So far none of the platforms which we support use FIQ for anything, but when we end up supporting one it would be far better to surprise Xen with them than whatever guest happens to be running... Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7f77c56..9bc3198 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -89,8 +89,8 @@ void __cpuinit init_traps(void) CPTR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| - HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| + HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, 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 Sat Jul 05 16:45:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T5q-00011Z-2P; Sat, 05 Jul 2014 16:45:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5o-00011F-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:40 +0000 Received: from [85.158.139.211:39846] by server-3.bemta-5.messagelabs.com id 38/97-01676-3BB28B35; Sat, 05 Jul 2014 16:45:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1404578738!13838402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4197 invoked from network); 5 Jul 2014 16:45:39 -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 Jul 2014 16:45:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5l-0006Br-Ru for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5l-0002Mk-QB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:37 +0000 Date: Sat, 05 Jul 2014 16:45:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92b0b80f0d2d29d0e80bf35ea839ed6058b7f0fa Author: Ian Campbell AuthorDate: Fri Jun 13 13:15:04 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:05:00 2014 +0100 xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. I'm not sure why this wasn't added at the same time as the other debug registers. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 +++- xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 9bc3198..994b654 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1596,9 +1596,11 @@ static void do_sysreg(struct cpu_user_regs *regs, /* - Breakpoints */ HSR_SYSREG_DBG_CASES(DBGBVR): HSR_SYSREG_DBG_CASES(DBGBCR): - /* - Watchpoints */ + /* - Watchpoints */ HSR_SYSREG_DBG_CASES(DBGWVR): HSR_SYSREG_DBG_CASES(DBGWCR): + /* - Double Lock Register */ + case HSR_SYSREG_OSDLR_EL1: if ( hsr.sysreg.read ) *x = 0; /* else: write ignored */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 4a4de34..b00871c 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -42,6 +42,7 @@ #define HSR_SYSREG_MDSCR_EL1 HSR_SYSREG(2,0,c0,c2,2) #define HSR_SYSREG_OSLAR_EL1 HSR_SYSREG(2,0,c1,c0,4) +#define HSR_SYSREG_OSDLR_EL1 HSR_SYSREG(2,0,c1,c3,4) #define HSR_SYSREG_DBGBVRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,4) #define HSR_SYSREG_DBGBCRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,5) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:45:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T5q-00011Z-2P; Sat, 05 Jul 2014 16:45:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5o-00011F-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:40 +0000 Received: from [85.158.139.211:39846] by server-3.bemta-5.messagelabs.com id 38/97-01676-3BB28B35; Sat, 05 Jul 2014 16:45:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1404578738!13838402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4197 invoked from network); 5 Jul 2014 16:45:39 -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 Jul 2014 16:45:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5l-0006Br-Ru for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5l-0002Mk-QB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:37 +0000 Date: Sat, 05 Jul 2014 16:45:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92b0b80f0d2d29d0e80bf35ea839ed6058b7f0fa Author: Ian Campbell AuthorDate: Fri Jun 13 13:15:04 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 11:05:00 2014 +0100 xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. I'm not sure why this wasn't added at the same time as the other debug registers. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 +++- xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 9bc3198..994b654 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1596,9 +1596,11 @@ static void do_sysreg(struct cpu_user_regs *regs, /* - Breakpoints */ HSR_SYSREG_DBG_CASES(DBGBVR): HSR_SYSREG_DBG_CASES(DBGBCR): - /* - Watchpoints */ + /* - Watchpoints */ HSR_SYSREG_DBG_CASES(DBGWVR): HSR_SYSREG_DBG_CASES(DBGWCR): + /* - Double Lock Register */ + case HSR_SYSREG_OSDLR_EL1: if ( hsr.sysreg.read ) *x = 0; /* else: write ignored */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 4a4de34..b00871c 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -42,6 +42,7 @@ #define HSR_SYSREG_MDSCR_EL1 HSR_SYSREG(2,0,c0,c2,2) #define HSR_SYSREG_OSLAR_EL1 HSR_SYSREG(2,0,c1,c0,4) +#define HSR_SYSREG_OSDLR_EL1 HSR_SYSREG(2,0,c1,c3,4) #define HSR_SYSREG_DBGBVRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,4) #define HSR_SYSREG_DBGBCRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,5) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:45:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T60-00013R-5I; Sat, 05 Jul 2014 16:45:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5y-000132-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:50 +0000 Received: from [85.158.139.211:52356] by server-7.bemta-5.messagelabs.com id 1A/8D-03657-DBB28B35; Sat, 05 Jul 2014 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404578748!13815308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3445 invoked from network); 5 Jul 2014 16:45:49 -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; 5 Jul 2014 16:45:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5w-0006Bx-14 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5v-0002NF-VT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:48 +0000 Date: Sat, 05 Jul 2014 16:45:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/libxl: bump library SONAMEs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d172e6b648f35c7f061a5fff351078ff3ff59e8a Author: Dario Faggioli AuthorDate: Fri Jun 20 18:18:53 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:32 2014 +0100 libxc/libxl: bump library SONAMEs The following two patches break both libxc and libxl ABI and API, so we better bump the MAJORs. Of course, for libxl, proper measures are taken (in the relevant patch) in order to guarantee API stability. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 63be3d3..f77677c 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.4 +MAJOR = 4.5 MINOR = 0 CTRL_SRCS-y := diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 7fc42c8..8dd8c95 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,7 +5,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.4 +MAJOR = 4.5 MINOR = 0 XLUMAJOR = 4.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 Sat Jul 05 16:45:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:45: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 1X3T60-00013R-5I; Sat, 05 Jul 2014 16:45:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5y-000132-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:50 +0000 Received: from [85.158.139.211:52356] by server-7.bemta-5.messagelabs.com id 1A/8D-03657-DBB28B35; Sat, 05 Jul 2014 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404578748!13815308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3445 invoked from network); 5 Jul 2014 16:45:49 -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; 5 Jul 2014 16:45:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T5w-0006Bx-14 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T5v-0002NF-VT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:48 +0000 Date: Sat, 05 Jul 2014 16:45:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/libxl: bump library SONAMEs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d172e6b648f35c7f061a5fff351078ff3ff59e8a Author: Dario Faggioli AuthorDate: Fri Jun 20 18:18:53 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:32 2014 +0100 libxc/libxl: bump library SONAMEs The following two patches break both libxc and libxl ABI and API, so we better bump the MAJORs. Of course, for libxl, proper measures are taken (in the relevant patch) in order to guarantee API stability. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 63be3d3..f77677c 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.4 +MAJOR = 4.5 MINOR = 0 CTRL_SRCS-y := diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 7fc42c8..8dd8c95 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,7 +5,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.4 +MAJOR = 4.5 MINOR = 0 XLUMAJOR = 4.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 Sat Jul 05 16:46:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6C-00015f-9H; Sat, 05 Jul 2014 16:46:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6A-00015D-Pc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:02 +0000 Received: from [85.158.139.211:40455] by server-3.bemta-5.messagelabs.com id C1/C7-01676-ACB28B35; Sat, 05 Jul 2014 16:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1404578758!13821756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20844 invoked from network); 5 Jul 2014 16:45:59 -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; 5 Jul 2014 16:45:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T66-0006C6-7Y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T66-0002Nj-5S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:58 +0000 Date: Sat, 05 Jul 2014 16:45:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: get and set soft and hard affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cc89d3101d8874e01a69a89a65736a2adfbd199 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:01 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:32 2014 +0100 libxc: get and set soft and hard affinity by using the flag and the new cpumap arguments introduced in the parameters of the DOMCTL_{get,set}_vcpuaffinity hypercalls. Now, both xc_vcpu_setaffinity() and xc_vcpu_getaffinity() have a new flag parameter, to specify whether the user wants to set/get hard affinity, soft affinity or both. They also have two cpumap parameters instead of only one. This way, it is possible to set/get both hard and soft affinity at the same time (and, in case of set, each one to its own value). In xc_vcpu_setaffinity(), the cpumaps are IN/OUT parameters, as it is for the corresponding arguments of the DOMCTL_set_vcpuaffinity hypercall. What Xen puts there is the hard and soft effective affinity, that is what Xen will actually use for scheduling. In-tree callers are also fixed to cope with the new interface. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 68 ++++++++++++++++++++++------------ tools/libxc/xenctrl.h | 55 +++++++++++++++++++++++++++- tools/libxl/libxl.c | 6 ++- tools/ocaml/libs/xc/xenctrl_stubs.c | 8 +++- tools/python/xen/lowlevel/xc/xc.c | 6 ++- 5 files changed, 111 insertions(+), 32 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index d5d6d12..65d9a08 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -202,10 +202,15 @@ int xc_domain_node_getaffinity(xc_interface *xch, int xc_vcpu_setaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap) + xc_cpumap_t cpumap_hard_inout, + xc_cpumap_t cpumap_soft_inout, + uint32_t flags) { DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(uint8_t, local); + DECLARE_HYPERCALL_BOUNCE(cpumap_hard_inout, 0, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(cpumap_soft_inout, 0, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); int ret = -1; int cpusize; @@ -213,32 +218,37 @@ int xc_vcpu_setaffinity(xc_interface *xch, if (cpusize <= 0) { PERROR("Could not get number of cpus"); - goto out; + return -1; } - local = xc_hypercall_buffer_alloc(xch, local, cpusize); - if ( local == NULL ) + HYPERCALL_BOUNCE_SET_SIZE(cpumap_hard_inout, cpusize); + HYPERCALL_BOUNCE_SET_SIZE(cpumap_soft_inout, cpusize); + + if ( xc_hypercall_bounce_pre(xch, cpumap_hard_inout) || + xc_hypercall_bounce_pre(xch, cpumap_soft_inout) ) { - PERROR("Could not allocate memory for setvcpuaffinity domctl hypercall"); + PERROR("Could not allocate hcall buffers for DOMCTL_setvcpuaffinity"); goto out; } domctl.cmd = XEN_DOMCTL_setvcpuaffinity; domctl.domain = (domid_t)domid; domctl.u.vcpuaffinity.vcpu = vcpu; - domctl.u.vcpuaffinity.flags = XEN_VCPUAFFINITY_HARD; - - memcpy(local, cpumap, cpusize); - - set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, local); + domctl.u.vcpuaffinity.flags = flags; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, + cpumap_hard_inout); domctl.u.vcpuaffinity.cpumap_hard.nr_bits = cpusize * 8; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_soft.bitmap, + cpumap_soft_inout); + domctl.u.vcpuaffinity.cpumap_soft.nr_bits = cpusize * 8; ret = do_domctl(xch, &domctl); - xc_hypercall_buffer_free(xch, local); - out: + xc_hypercall_bounce_post(xch, cpumap_hard_inout); + xc_hypercall_bounce_post(xch, cpumap_soft_inout); + return ret; } @@ -246,10 +256,13 @@ int xc_vcpu_setaffinity(xc_interface *xch, int xc_vcpu_getaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap) + xc_cpumap_t cpumap_hard, + xc_cpumap_t cpumap_soft, + uint32_t flags) { DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(uint8_t, local); + DECLARE_HYPERCALL_BOUNCE(cpumap_hard, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(cpumap_soft, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int ret = -1; int cpusize; @@ -257,30 +270,37 @@ int xc_vcpu_getaffinity(xc_interface *xch, if (cpusize <= 0) { PERROR("Could not get number of cpus"); - goto out; + return -1; } - local = xc_hypercall_buffer_alloc(xch, local, cpusize); - if (local == NULL) + HYPERCALL_BOUNCE_SET_SIZE(cpumap_hard, cpusize); + HYPERCALL_BOUNCE_SET_SIZE(cpumap_soft, cpusize); + + if ( xc_hypercall_bounce_pre(xch, cpumap_hard) || + xc_hypercall_bounce_pre(xch, cpumap_soft) ) { - PERROR("Could not allocate memory for getvcpuaffinity domctl hypercall"); + PERROR("Could not allocate hcall buffers for DOMCTL_getvcpuaffinity"); goto out; } domctl.cmd = XEN_DOMCTL_getvcpuaffinity; domctl.domain = (domid_t)domid; domctl.u.vcpuaffinity.vcpu = vcpu; - domctl.u.vcpuaffinity.flags = XEN_VCPUAFFINITY_HARD; + domctl.u.vcpuaffinity.flags = flags; - set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, local); + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, + cpumap_hard); domctl.u.vcpuaffinity.cpumap_hard.nr_bits = cpusize * 8; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_soft.bitmap, + cpumap_soft); + domctl.u.vcpuaffinity.cpumap_soft.nr_bits = cpusize * 8; ret = do_domctl(xch, &domctl); - memcpy(cpumap, local, cpusize); + out: + xc_hypercall_bounce_post(xch, cpumap_hard); + xc_hypercall_bounce_post(xch, cpumap_soft); - xc_hypercall_buffer_free(xch, local); -out: return ret; } diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index af6f249..7986a31 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -600,14 +600,65 @@ int xc_domain_node_getaffinity(xc_interface *xch, uint32_t domind, xc_nodemap_t nodemap); +/** + * This function specifies the CPU affinity for a vcpu. + * + * There are two kinds of affinity. Soft affinity is on what CPUs a vcpu + * prefers to run. Hard affinity is on what CPUs a vcpu is allowed to run. + * If flags contains XEN_VCPUAFFINITY_SOFT, the soft affinity it is set to + * what cpumap_soft_inout contains. If flags contains XEN_VCPUAFFINITY_HARD, + * the hard affinity is set to what cpumap_hard_inout contains. Both flags + * can be set at the same time, in which case both soft and hard affinity are + * set to what the respective parameter contains. + * + * The function also returns the effective hard or/and soft affinity, still + * via the cpumap_soft_inout and cpumap_hard_inout parameters. Effective + * affinity is, in case of soft affinity, the intersection of soft affinity, + * hard affinity and the cpupool's online CPUs for the domain, and is returned + * in cpumap_soft_inout, if XEN_VCPUAFFINITY_SOFT is set in flags. In case of + * hard affinity, it is the intersection between hard affinity and the + * cpupool's online CPUs, and is returned in cpumap_hard_inout, if + * XEN_VCPUAFFINITY_HARD is set in flags. If both flags are set, both soft + * and hard affinity are returned in the respective parameter. + * + * We do report it back as effective affinity is what the Xen scheduler will + * actually use, and we thus allow checking whether or not that matches with, + * or at least is good enough for, the caller's purposes. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the id of the domain to which the vcpu belongs + * @param vcpu the vcpu id wihin the domain + * @param cpumap_hard_inout specifies(/returns) the (effective) hard affinity + * @param cpumap_soft_inout specifies(/returns) the (effective) soft affinity + * @param flags what we want to set + */ int xc_vcpu_setaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap); + xc_cpumap_t cpumap_hard_inout, + xc_cpumap_t cpumap_soft_inout, + uint32_t flags); + +/** + * This function retrieves hard and soft CPU affinity of a vcpu, + * depending on what flags are set. + * + * Soft affinity is returned in cpumap_soft if XEN_VCPUAFFINITY_SOFT is set. + * Hard affinity is returned in cpumap_hard if XEN_VCPUAFFINITY_HARD is set. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the id of the domain to which the vcpu belongs + * @param vcpu the vcpu id wihin the domain + * @param cpumap_hard is where hard affinity is returned + * @param cpumap_soft is where soft affinity is returned + * @param flags what we want get + */ int xc_vcpu_getaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap); + xc_cpumap_t cpumap_hard, + xc_cpumap_t cpumap_soft, + uint32_t flags); /** diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 62e251a..43aadea 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4611,7 +4611,8 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, goto err; } if (xc_vcpu_getaffinity(ctx->xch, domid, *nr_vcpus_out, - ptr->cpumap.map) == -1) { + ptr->cpumap.map, NULL, + XEN_VCPUAFFINITY_HARD) == -1) { LOGE(ERROR, "getting vcpu affinity"); goto err; } @@ -4635,7 +4636,8 @@ err: int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_bitmap *cpumap) { - if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map)) { + if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map, NULL, + XEN_VCPUAFFINITY_HARD)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); return ERROR_FAIL; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ff29b47..f0810eb 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -438,7 +438,9 @@ CAMLprim value stub_xc_vcpu_setaffinity(value xch, value domid, c_cpumap[i/8] |= 1 << (i&7); } retval = xc_vcpu_setaffinity(_H(xch), _D(domid), - Int_val(vcpu), c_cpumap); + Int_val(vcpu), + c_cpumap, NULL, + XEN_VCPUAFFINITY_HARD); free(c_cpumap); if (retval < 0) @@ -460,7 +462,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, failwith_xc(_H(xch)); retval = xc_vcpu_getaffinity(_H(xch), _D(domid), - Int_val(vcpu), c_cpumap); + Int_val(vcpu), + c_cpumap, NULL, + XEN_VCPUAFFINITY_HARD); if (retval < 0) { free(c_cpumap); failwith_xc(_H(xch)); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index cb34446..54e8799 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -256,7 +256,8 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self, } } - if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap) != 0 ) + if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap, + NULL, XEN_VCPUAFFINITY_HARD) != 0 ) { free(cpumap); return pyxc_error_to_exception(self->xc_handle); @@ -403,7 +404,8 @@ static PyObject *pyxc_vcpu_getinfo(XcObject *self, if(cpumap == NULL) return pyxc_error_to_exception(self->xc_handle); - rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap); + rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap, + NULL, XEN_VCPUAFFINITY_HARD); if ( rc < 0 ) { free(cpumap); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6C-00015f-9H; Sat, 05 Jul 2014 16:46:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6A-00015D-Pc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:02 +0000 Received: from [85.158.139.211:40455] by server-3.bemta-5.messagelabs.com id C1/C7-01676-ACB28B35; Sat, 05 Jul 2014 16:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1404578758!13821756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20844 invoked from network); 5 Jul 2014 16:45:59 -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; 5 Jul 2014 16:45:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T66-0006C6-7Y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T66-0002Nj-5S for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:45:58 +0000 Date: Sat, 05 Jul 2014 16:45:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: get and set soft and hard affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cc89d3101d8874e01a69a89a65736a2adfbd199 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:01 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:32 2014 +0100 libxc: get and set soft and hard affinity by using the flag and the new cpumap arguments introduced in the parameters of the DOMCTL_{get,set}_vcpuaffinity hypercalls. Now, both xc_vcpu_setaffinity() and xc_vcpu_getaffinity() have a new flag parameter, to specify whether the user wants to set/get hard affinity, soft affinity or both. They also have two cpumap parameters instead of only one. This way, it is possible to set/get both hard and soft affinity at the same time (and, in case of set, each one to its own value). In xc_vcpu_setaffinity(), the cpumaps are IN/OUT parameters, as it is for the corresponding arguments of the DOMCTL_set_vcpuaffinity hypercall. What Xen puts there is the hard and soft effective affinity, that is what Xen will actually use for scheduling. In-tree callers are also fixed to cope with the new interface. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 68 ++++++++++++++++++++++------------ tools/libxc/xenctrl.h | 55 +++++++++++++++++++++++++++- tools/libxl/libxl.c | 6 ++- tools/ocaml/libs/xc/xenctrl_stubs.c | 8 +++- tools/python/xen/lowlevel/xc/xc.c | 6 ++- 5 files changed, 111 insertions(+), 32 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index d5d6d12..65d9a08 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -202,10 +202,15 @@ int xc_domain_node_getaffinity(xc_interface *xch, int xc_vcpu_setaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap) + xc_cpumap_t cpumap_hard_inout, + xc_cpumap_t cpumap_soft_inout, + uint32_t flags) { DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(uint8_t, local); + DECLARE_HYPERCALL_BOUNCE(cpumap_hard_inout, 0, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(cpumap_soft_inout, 0, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); int ret = -1; int cpusize; @@ -213,32 +218,37 @@ int xc_vcpu_setaffinity(xc_interface *xch, if (cpusize <= 0) { PERROR("Could not get number of cpus"); - goto out; + return -1; } - local = xc_hypercall_buffer_alloc(xch, local, cpusize); - if ( local == NULL ) + HYPERCALL_BOUNCE_SET_SIZE(cpumap_hard_inout, cpusize); + HYPERCALL_BOUNCE_SET_SIZE(cpumap_soft_inout, cpusize); + + if ( xc_hypercall_bounce_pre(xch, cpumap_hard_inout) || + xc_hypercall_bounce_pre(xch, cpumap_soft_inout) ) { - PERROR("Could not allocate memory for setvcpuaffinity domctl hypercall"); + PERROR("Could not allocate hcall buffers for DOMCTL_setvcpuaffinity"); goto out; } domctl.cmd = XEN_DOMCTL_setvcpuaffinity; domctl.domain = (domid_t)domid; domctl.u.vcpuaffinity.vcpu = vcpu; - domctl.u.vcpuaffinity.flags = XEN_VCPUAFFINITY_HARD; - - memcpy(local, cpumap, cpusize); - - set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, local); + domctl.u.vcpuaffinity.flags = flags; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, + cpumap_hard_inout); domctl.u.vcpuaffinity.cpumap_hard.nr_bits = cpusize * 8; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_soft.bitmap, + cpumap_soft_inout); + domctl.u.vcpuaffinity.cpumap_soft.nr_bits = cpusize * 8; ret = do_domctl(xch, &domctl); - xc_hypercall_buffer_free(xch, local); - out: + xc_hypercall_bounce_post(xch, cpumap_hard_inout); + xc_hypercall_bounce_post(xch, cpumap_soft_inout); + return ret; } @@ -246,10 +256,13 @@ int xc_vcpu_setaffinity(xc_interface *xch, int xc_vcpu_getaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap) + xc_cpumap_t cpumap_hard, + xc_cpumap_t cpumap_soft, + uint32_t flags) { DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(uint8_t, local); + DECLARE_HYPERCALL_BOUNCE(cpumap_hard, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(cpumap_soft, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int ret = -1; int cpusize; @@ -257,30 +270,37 @@ int xc_vcpu_getaffinity(xc_interface *xch, if (cpusize <= 0) { PERROR("Could not get number of cpus"); - goto out; + return -1; } - local = xc_hypercall_buffer_alloc(xch, local, cpusize); - if (local == NULL) + HYPERCALL_BOUNCE_SET_SIZE(cpumap_hard, cpusize); + HYPERCALL_BOUNCE_SET_SIZE(cpumap_soft, cpusize); + + if ( xc_hypercall_bounce_pre(xch, cpumap_hard) || + xc_hypercall_bounce_pre(xch, cpumap_soft) ) { - PERROR("Could not allocate memory for getvcpuaffinity domctl hypercall"); + PERROR("Could not allocate hcall buffers for DOMCTL_getvcpuaffinity"); goto out; } domctl.cmd = XEN_DOMCTL_getvcpuaffinity; domctl.domain = (domid_t)domid; domctl.u.vcpuaffinity.vcpu = vcpu; - domctl.u.vcpuaffinity.flags = XEN_VCPUAFFINITY_HARD; + domctl.u.vcpuaffinity.flags = flags; - set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, local); + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_hard.bitmap, + cpumap_hard); domctl.u.vcpuaffinity.cpumap_hard.nr_bits = cpusize * 8; + set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap_soft.bitmap, + cpumap_soft); + domctl.u.vcpuaffinity.cpumap_soft.nr_bits = cpusize * 8; ret = do_domctl(xch, &domctl); - memcpy(cpumap, local, cpusize); + out: + xc_hypercall_bounce_post(xch, cpumap_hard); + xc_hypercall_bounce_post(xch, cpumap_soft); - xc_hypercall_buffer_free(xch, local); -out: return ret; } diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index af6f249..7986a31 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -600,14 +600,65 @@ int xc_domain_node_getaffinity(xc_interface *xch, uint32_t domind, xc_nodemap_t nodemap); +/** + * This function specifies the CPU affinity for a vcpu. + * + * There are two kinds of affinity. Soft affinity is on what CPUs a vcpu + * prefers to run. Hard affinity is on what CPUs a vcpu is allowed to run. + * If flags contains XEN_VCPUAFFINITY_SOFT, the soft affinity it is set to + * what cpumap_soft_inout contains. If flags contains XEN_VCPUAFFINITY_HARD, + * the hard affinity is set to what cpumap_hard_inout contains. Both flags + * can be set at the same time, in which case both soft and hard affinity are + * set to what the respective parameter contains. + * + * The function also returns the effective hard or/and soft affinity, still + * via the cpumap_soft_inout and cpumap_hard_inout parameters. Effective + * affinity is, in case of soft affinity, the intersection of soft affinity, + * hard affinity and the cpupool's online CPUs for the domain, and is returned + * in cpumap_soft_inout, if XEN_VCPUAFFINITY_SOFT is set in flags. In case of + * hard affinity, it is the intersection between hard affinity and the + * cpupool's online CPUs, and is returned in cpumap_hard_inout, if + * XEN_VCPUAFFINITY_HARD is set in flags. If both flags are set, both soft + * and hard affinity are returned in the respective parameter. + * + * We do report it back as effective affinity is what the Xen scheduler will + * actually use, and we thus allow checking whether or not that matches with, + * or at least is good enough for, the caller's purposes. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the id of the domain to which the vcpu belongs + * @param vcpu the vcpu id wihin the domain + * @param cpumap_hard_inout specifies(/returns) the (effective) hard affinity + * @param cpumap_soft_inout specifies(/returns) the (effective) soft affinity + * @param flags what we want to set + */ int xc_vcpu_setaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap); + xc_cpumap_t cpumap_hard_inout, + xc_cpumap_t cpumap_soft_inout, + uint32_t flags); + +/** + * This function retrieves hard and soft CPU affinity of a vcpu, + * depending on what flags are set. + * + * Soft affinity is returned in cpumap_soft if XEN_VCPUAFFINITY_SOFT is set. + * Hard affinity is returned in cpumap_hard if XEN_VCPUAFFINITY_HARD is set. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the id of the domain to which the vcpu belongs + * @param vcpu the vcpu id wihin the domain + * @param cpumap_hard is where hard affinity is returned + * @param cpumap_soft is where soft affinity is returned + * @param flags what we want get + */ int xc_vcpu_getaffinity(xc_interface *xch, uint32_t domid, int vcpu, - xc_cpumap_t cpumap); + xc_cpumap_t cpumap_hard, + xc_cpumap_t cpumap_soft, + uint32_t flags); /** diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 62e251a..43aadea 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4611,7 +4611,8 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, goto err; } if (xc_vcpu_getaffinity(ctx->xch, domid, *nr_vcpus_out, - ptr->cpumap.map) == -1) { + ptr->cpumap.map, NULL, + XEN_VCPUAFFINITY_HARD) == -1) { LOGE(ERROR, "getting vcpu affinity"); goto err; } @@ -4635,7 +4636,8 @@ err: int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_bitmap *cpumap) { - if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map)) { + if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map, NULL, + XEN_VCPUAFFINITY_HARD)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); return ERROR_FAIL; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ff29b47..f0810eb 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -438,7 +438,9 @@ CAMLprim value stub_xc_vcpu_setaffinity(value xch, value domid, c_cpumap[i/8] |= 1 << (i&7); } retval = xc_vcpu_setaffinity(_H(xch), _D(domid), - Int_val(vcpu), c_cpumap); + Int_val(vcpu), + c_cpumap, NULL, + XEN_VCPUAFFINITY_HARD); free(c_cpumap); if (retval < 0) @@ -460,7 +462,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, failwith_xc(_H(xch)); retval = xc_vcpu_getaffinity(_H(xch), _D(domid), - Int_val(vcpu), c_cpumap); + Int_val(vcpu), + c_cpumap, NULL, + XEN_VCPUAFFINITY_HARD); if (retval < 0) { free(c_cpumap); failwith_xc(_H(xch)); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index cb34446..54e8799 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -256,7 +256,8 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self, } } - if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap) != 0 ) + if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap, + NULL, XEN_VCPUAFFINITY_HARD) != 0 ) { free(cpumap); return pyxc_error_to_exception(self->xc_handle); @@ -403,7 +404,8 @@ static PyObject *pyxc_vcpu_getinfo(XcObject *self, if(cpumap == NULL) return pyxc_error_to_exception(self->xc_handle); - rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap); + rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap, + NULL, XEN_VCPUAFFINITY_HARD); if ( rc < 0 ) { free(cpumap); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6L-00017a-EM; Sat, 05 Jul 2014 16:46:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6J-00017F-QR for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:12 +0000 Received: from [85.158.137.68:18165] by server-15.bemta-3.messagelabs.com id 04/EE-26980-3DB28B35; Sat, 05 Jul 2014 16:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404578768!14199529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31898 invoked from network); 5 Jul 2014 16:46:09 -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 Jul 2014 16:46:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6G-0006Cf-EQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6G-0002Ot-CQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:08 +0000 Date: Sat, 05 Jul 2014 16:46:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: get and set soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 871b43a309d80ac99458c13c2c3da8d15c482d30 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:12 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl: get and set soft affinity Make space a new cpumap in vcpu_info, called cpumap_soft, for retrieving soft affinity, and amend the relevant API accordingly. libxl_set_vcpuaffinity() now takes two cpumaps, one for hard and one for soft affinity (LIBXL_API_VERSION is exploited to retain source level backword compatibility). Either of the two cpumap can be NULL, in which case, only the affinity corresponding to the non-NULL cpumap will be affected. Getting soft affinity happens indirectly (see, e.g., `xl vcpu-list'), as it is already for hard affinity). This commit also introduces some logic to check whether the affinity which will be used by Xen to schedule the vCPU(s) does actually match with the cpumaps provided. In fact, we want to allow every possible combination of hard and soft affinity to be set, but we warn the user upon particularly weird situations (e.g., hard and soft being disjoint sets of pCPUs). This very change also update the error handling for calls to libxl_set_vcpuaffinity() in xl, as that can now be any libxl error code, not just only -1. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl.c | 99 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl.h | 24 ++++++++++- tools/libxl/libxl_dom.c | 3 +- tools/libxl/libxl_types.idl | 3 +- tools/libxl/libxl_utils.h | 25 +++++++++++ tools/libxl/xl_cmdimpl.c | 6 +- 6 files changed, 141 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 43aadea..16cede8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4606,13 +4606,17 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, libxl_bitmap_init(&ptr->cpumap); if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap, 0)) goto err; + libxl_bitmap_init(&ptr->cpumap_soft); + if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap_soft, 0)) + goto err; if (xc_vcpu_getinfo(ctx->xch, domid, *nr_vcpus_out, &vcpuinfo) == -1) { LOGE(ERROR, "getting vcpu info"); goto err; } + if (xc_vcpu_getaffinity(ctx->xch, domid, *nr_vcpus_out, - ptr->cpumap.map, NULL, - XEN_VCPUAFFINITY_HARD) == -1) { + ptr->cpumap.map, ptr->cpumap_soft.map, + XEN_VCPUAFFINITY_SOFT|XEN_VCPUAFFINITY_HARD) == -1) { LOGE(ERROR, "getting vcpu affinity"); goto err; } @@ -4628,34 +4632,105 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, err: libxl_bitmap_dispose(&ptr->cpumap); + libxl_bitmap_dispose(&ptr->cpumap_soft); free(ret); GC_FREE; return NULL; } int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_bitmap *cpumap) + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) { - if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map, NULL, - XEN_VCPUAFFINITY_HARD)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); - return ERROR_FAIL; + GC_INIT(ctx); + libxl_bitmap hard, soft; + int rc, flags = 0; + + libxl_bitmap_init(&hard); + libxl_bitmap_init(&soft); + + if (!cpumap_hard && !cpumap_soft) { + rc = ERROR_INVAL; + goto out; } - return 0; + + /* + * Xen wants writable hard and/or soft cpumaps, to put back in them + * the effective hard and/or soft affinity that will be used. + */ + if (cpumap_hard) { + rc = libxl_cpu_bitmap_alloc(ctx, &hard, 0); + if (rc) + goto out; + + libxl_bitmap_copy(ctx, &hard, cpumap_hard); + flags = XEN_VCPUAFFINITY_HARD; + } + if (cpumap_soft) { + rc = libxl_cpu_bitmap_alloc(ctx, &soft, 0); + if (rc) + goto out; + + libxl_bitmap_copy(ctx, &soft, cpumap_soft); + flags |= XEN_VCPUAFFINITY_SOFT; + } + + if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, + cpumap_hard ? hard.map : NULL, + cpumap_soft ? soft.map : NULL, + flags)) { + LOGE(ERROR, "setting vcpu affinity"); + rc = ERROR_FAIL; + goto out; + } + + /* + * Let's check the results. Hard affinity will never be empty, but it + * is possible that Xen will use something different from what we asked + * for various reasons. If that's the case, report it. + */ + if (cpumap_hard && + !libxl_bitmap_equal(cpumap_hard, &hard, 0)) + LOG(DEBUG, "New hard affinity for vcpu %d has unreachable cpus", + vcpuid); + /* + * Soft affinity can both be different from what asked and empty. Check + * for (and report) both. + */ + if (cpumap_soft) { + if (!libxl_bitmap_equal(cpumap_soft, &soft, 0)) + LOG(DEBUG, "New soft affinity for vcpu %d has unreachable cpus", + vcpuid); + if (libxl_bitmap_is_empty(&soft)) + LOG(WARN, "all cpus in soft affinity of vcpu %d are unreachable." + " Only hard affinity will be considered for scheduling", + vcpuid); + } + + rc = 0; + out: + libxl_bitmap_dispose(&hard); + libxl_bitmap_dispose(&soft); + GC_FREE; + return rc; } int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_bitmap *cpumap) + unsigned int max_vcpus, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) { + GC_INIT(ctx); int i, rc = 0; for (i = 0; i < max_vcpus; i++) { - if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap)) { - LIBXL__LOG(ctx, LIBXL__LOG_WARNING, - "failed to set affinity for %d", i); + if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap_hard, cpumap_soft)) { + LOG(WARN, "failed to set affinity for %d", i); rc = ERROR_FAIL; } } + + GC_FREE; return rc; } diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 69ceac8..a8477c9 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -104,6 +104,13 @@ #define LIBXL_HAVE_BUILDINFO_EVENT_CHANNELS 1 /* + * LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY indicates that a 'cpumap_soft' + * field (of libxl_bitmap type) is present in libxl_vcpuinfo, + * containing the soft affinity of a vcpu. + */ +#define LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY 1 + +/* * LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE indicates that a * 'direct_io_safe' field (of boolean type) is present in * libxl_device_disk. @@ -1136,9 +1143,22 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_bitmap *cpumap); + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_bitmap *cpumap); + unsigned int max_vcpus, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft); + +#if defined (LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 + +#define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ + libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) +#define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ + libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) + +#endif + int libxl_domain_set_nodeaffinity(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *nodemap); int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 661999c..a90a8d5 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -261,7 +261,8 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, return rc; } libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + &info->cpumap, NULL); if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1018142..37df854 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -520,7 +520,8 @@ libxl_vcpuinfo = Struct("vcpuinfo", [ ("blocked", bool), ("running", bool), ("vcpu_time", uint64), # total vcpu time ran (ns) - ("cpumap", libxl_bitmap), # current cpu's affinities + ("cpumap", libxl_bitmap), # current hard cpu affinity + ("cpumap_soft", libxl_bitmap), # current soft cpu affinity ], dir=DIR_OUT) libxl_physinfo = Struct("physinfo", [ diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8bfb81b..13b42a1 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -101,6 +101,31 @@ static inline int libxl_bitmap_cpu_valid(libxl_bitmap *bitmap, int bit) #define libxl_for_each_set_bit(v, m) for (v = 0; v < (m).size * 8; v++) \ if (libxl_bitmap_test(&(m), v)) +/* + * Compares two bitmaps bit by bit, up to nr_bits or, if nr_bits is 0, up + * to the size of the largest bitmap. If sizes does not match, bits past the + * of a bitmap are considered as being 0, which matches with the semantic and + * implementation of libxl_bitmap_test I think(). + * + * So, basically, [0,1,0] and [0,1] are considered equal, while [0,1,1] and + * [0,1] are different. + */ +static inline int libxl_bitmap_equal(const libxl_bitmap *ba, + const libxl_bitmap *bb, + int nr_bits) +{ + int i; + + if (nr_bits == 0) + nr_bits = ba->size > bb->size ? ba->size * 8 : bb->size * 8; + + for (i = 0; i < nr_bits; i++) { + if (libxl_bitmap_test(ba, i) != libxl_bitmap_test(bb, i)) + return 0; + } + return 1; +} + int libxl_cpu_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *cpumap, int max_cpus); int libxl_node_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *nodemap, int max_nodes); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index be041f2..4d5e0d5 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2198,7 +2198,7 @@ start: } else { libxl_bitmap_set_any(&vcpu_cpumap); } - if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap)) { + if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap, NULL)) { fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); @@ -4622,7 +4622,7 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } if (vcpuid != -1) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap) == -1) { + if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap, NULL)) { fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", vcpuid); goto out; } @@ -4634,7 +4634,7 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } for (i = 0; i < nb_vcpu; i++) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuinfo[i].vcpuid, - &cpumap) == -1) { + &cpumap, NULL)) { fprintf(stderr, "libxl_set_vcpuaffinity failed" " on vcpu `%u'.\n", vcpuinfo[i].vcpuid); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6L-00017a-EM; Sat, 05 Jul 2014 16:46:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6J-00017F-QR for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:12 +0000 Received: from [85.158.137.68:18165] by server-15.bemta-3.messagelabs.com id 04/EE-26980-3DB28B35; Sat, 05 Jul 2014 16:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404578768!14199529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31898 invoked from network); 5 Jul 2014 16:46:09 -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 Jul 2014 16:46:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6G-0006Cf-EQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6G-0002Ot-CQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:08 +0000 Date: Sat, 05 Jul 2014 16:46:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: get and set soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 871b43a309d80ac99458c13c2c3da8d15c482d30 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:12 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl: get and set soft affinity Make space a new cpumap in vcpu_info, called cpumap_soft, for retrieving soft affinity, and amend the relevant API accordingly. libxl_set_vcpuaffinity() now takes two cpumaps, one for hard and one for soft affinity (LIBXL_API_VERSION is exploited to retain source level backword compatibility). Either of the two cpumap can be NULL, in which case, only the affinity corresponding to the non-NULL cpumap will be affected. Getting soft affinity happens indirectly (see, e.g., `xl vcpu-list'), as it is already for hard affinity). This commit also introduces some logic to check whether the affinity which will be used by Xen to schedule the vCPU(s) does actually match with the cpumaps provided. In fact, we want to allow every possible combination of hard and soft affinity to be set, but we warn the user upon particularly weird situations (e.g., hard and soft being disjoint sets of pCPUs). This very change also update the error handling for calls to libxl_set_vcpuaffinity() in xl, as that can now be any libxl error code, not just only -1. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl.c | 99 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl.h | 24 ++++++++++- tools/libxl/libxl_dom.c | 3 +- tools/libxl/libxl_types.idl | 3 +- tools/libxl/libxl_utils.h | 25 +++++++++++ tools/libxl/xl_cmdimpl.c | 6 +- 6 files changed, 141 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 43aadea..16cede8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4606,13 +4606,17 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, libxl_bitmap_init(&ptr->cpumap); if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap, 0)) goto err; + libxl_bitmap_init(&ptr->cpumap_soft); + if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap_soft, 0)) + goto err; if (xc_vcpu_getinfo(ctx->xch, domid, *nr_vcpus_out, &vcpuinfo) == -1) { LOGE(ERROR, "getting vcpu info"); goto err; } + if (xc_vcpu_getaffinity(ctx->xch, domid, *nr_vcpus_out, - ptr->cpumap.map, NULL, - XEN_VCPUAFFINITY_HARD) == -1) { + ptr->cpumap.map, ptr->cpumap_soft.map, + XEN_VCPUAFFINITY_SOFT|XEN_VCPUAFFINITY_HARD) == -1) { LOGE(ERROR, "getting vcpu affinity"); goto err; } @@ -4628,34 +4632,105 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, err: libxl_bitmap_dispose(&ptr->cpumap); + libxl_bitmap_dispose(&ptr->cpumap_soft); free(ret); GC_FREE; return NULL; } int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_bitmap *cpumap) + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) { - if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map, NULL, - XEN_VCPUAFFINITY_HARD)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); - return ERROR_FAIL; + GC_INIT(ctx); + libxl_bitmap hard, soft; + int rc, flags = 0; + + libxl_bitmap_init(&hard); + libxl_bitmap_init(&soft); + + if (!cpumap_hard && !cpumap_soft) { + rc = ERROR_INVAL; + goto out; } - return 0; + + /* + * Xen wants writable hard and/or soft cpumaps, to put back in them + * the effective hard and/or soft affinity that will be used. + */ + if (cpumap_hard) { + rc = libxl_cpu_bitmap_alloc(ctx, &hard, 0); + if (rc) + goto out; + + libxl_bitmap_copy(ctx, &hard, cpumap_hard); + flags = XEN_VCPUAFFINITY_HARD; + } + if (cpumap_soft) { + rc = libxl_cpu_bitmap_alloc(ctx, &soft, 0); + if (rc) + goto out; + + libxl_bitmap_copy(ctx, &soft, cpumap_soft); + flags |= XEN_VCPUAFFINITY_SOFT; + } + + if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, + cpumap_hard ? hard.map : NULL, + cpumap_soft ? soft.map : NULL, + flags)) { + LOGE(ERROR, "setting vcpu affinity"); + rc = ERROR_FAIL; + goto out; + } + + /* + * Let's check the results. Hard affinity will never be empty, but it + * is possible that Xen will use something different from what we asked + * for various reasons. If that's the case, report it. + */ + if (cpumap_hard && + !libxl_bitmap_equal(cpumap_hard, &hard, 0)) + LOG(DEBUG, "New hard affinity for vcpu %d has unreachable cpus", + vcpuid); + /* + * Soft affinity can both be different from what asked and empty. Check + * for (and report) both. + */ + if (cpumap_soft) { + if (!libxl_bitmap_equal(cpumap_soft, &soft, 0)) + LOG(DEBUG, "New soft affinity for vcpu %d has unreachable cpus", + vcpuid); + if (libxl_bitmap_is_empty(&soft)) + LOG(WARN, "all cpus in soft affinity of vcpu %d are unreachable." + " Only hard affinity will be considered for scheduling", + vcpuid); + } + + rc = 0; + out: + libxl_bitmap_dispose(&hard); + libxl_bitmap_dispose(&soft); + GC_FREE; + return rc; } int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_bitmap *cpumap) + unsigned int max_vcpus, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) { + GC_INIT(ctx); int i, rc = 0; for (i = 0; i < max_vcpus; i++) { - if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap)) { - LIBXL__LOG(ctx, LIBXL__LOG_WARNING, - "failed to set affinity for %d", i); + if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap_hard, cpumap_soft)) { + LOG(WARN, "failed to set affinity for %d", i); rc = ERROR_FAIL; } } + + GC_FREE; return rc; } diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 69ceac8..a8477c9 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -104,6 +104,13 @@ #define LIBXL_HAVE_BUILDINFO_EVENT_CHANNELS 1 /* + * LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY indicates that a 'cpumap_soft' + * field (of libxl_bitmap type) is present in libxl_vcpuinfo, + * containing the soft affinity of a vcpu. + */ +#define LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY 1 + +/* * LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE indicates that a * 'direct_io_safe' field (of boolean type) is present in * libxl_device_disk. @@ -1136,9 +1143,22 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_bitmap *cpumap); + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_bitmap *cpumap); + unsigned int max_vcpus, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft); + +#if defined (LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 + +#define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ + libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) +#define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ + libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) + +#endif + int libxl_domain_set_nodeaffinity(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *nodemap); int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 661999c..a90a8d5 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -261,7 +261,8 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, return rc; } libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + &info->cpumap, NULL); if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1018142..37df854 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -520,7 +520,8 @@ libxl_vcpuinfo = Struct("vcpuinfo", [ ("blocked", bool), ("running", bool), ("vcpu_time", uint64), # total vcpu time ran (ns) - ("cpumap", libxl_bitmap), # current cpu's affinities + ("cpumap", libxl_bitmap), # current hard cpu affinity + ("cpumap_soft", libxl_bitmap), # current soft cpu affinity ], dir=DIR_OUT) libxl_physinfo = Struct("physinfo", [ diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8bfb81b..13b42a1 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -101,6 +101,31 @@ static inline int libxl_bitmap_cpu_valid(libxl_bitmap *bitmap, int bit) #define libxl_for_each_set_bit(v, m) for (v = 0; v < (m).size * 8; v++) \ if (libxl_bitmap_test(&(m), v)) +/* + * Compares two bitmaps bit by bit, up to nr_bits or, if nr_bits is 0, up + * to the size of the largest bitmap. If sizes does not match, bits past the + * of a bitmap are considered as being 0, which matches with the semantic and + * implementation of libxl_bitmap_test I think(). + * + * So, basically, [0,1,0] and [0,1] are considered equal, while [0,1,1] and + * [0,1] are different. + */ +static inline int libxl_bitmap_equal(const libxl_bitmap *ba, + const libxl_bitmap *bb, + int nr_bits) +{ + int i; + + if (nr_bits == 0) + nr_bits = ba->size > bb->size ? ba->size * 8 : bb->size * 8; + + for (i = 0; i < nr_bits; i++) { + if (libxl_bitmap_test(ba, i) != libxl_bitmap_test(bb, i)) + return 0; + } + return 1; +} + int libxl_cpu_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *cpumap, int max_cpus); int libxl_node_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *nodemap, int max_nodes); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index be041f2..4d5e0d5 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2198,7 +2198,7 @@ start: } else { libxl_bitmap_set_any(&vcpu_cpumap); } - if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap)) { + if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap, NULL)) { fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); @@ -4622,7 +4622,7 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } if (vcpuid != -1) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap) == -1) { + if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap, NULL)) { fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", vcpuid); goto out; } @@ -4634,7 +4634,7 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } for (i = 0; i < nb_vcpu; i++) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuinfo[i].vcpuid, - &cpumap) == -1) { + &cpumap, NULL)) { fprintf(stderr, "libxl_set_vcpuaffinity failed" " on vcpu `%u'.\n", vcpuinfo[i].vcpuid); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6U-00019Z-Hc; Sat, 05 Jul 2014 16:46:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6T-00019H-4J for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:21 +0000 Received: from [193.109.254.147:7376] by server-4.bemta-14.messagelabs.com id 10/46-20586-CDB28B35; Sat, 05 Jul 2014 16:46:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404578778!15637652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25112 invoked from network); 5 Jul 2014 16:46:19 -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; 5 Jul 2014 16:46:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6Q-0006Cl-JU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6Q-0002PJ-IQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:18 +0000 Date: Sat, 05 Jul 2014 16:46:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change default for b_info->{cpu, node}map to "not 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 194e71830d8d09c9a75ed41abe02d3b8bb6ebe42 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:29 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl: Change default for b_info->{cpu, node}map to "not allocated" by avoiding allocating them in libxl__domain_build_info_setdefault. In fact, back in 7e449837 ("libxl: provide _init and _setdefault for libxl_domain_build_info") and a5d30c23 ("libxl: allow for explicitly specifying node-affinity"), it was decided that the default for these fields was for them to be allocated and filled. That is now causing problem, whenever we have to figure out whether the caller is using or not one of those fields. In fact, when we see a full bitmap, is it just the default value, or is the user that wants it that way? Since that kind of knowledge has become important, change the default to be "bitmap not allocated". It then becomes easy to know whether a libxl caller is using one of the fields, just by checking whether the bitmap is actually there with a non-zero size. This is very important for the following patches introducing new ways of specifying hard and soft affinity. It also allows us to improve the checks around NUMA automatic placement, during domain creation (and that bit is done in this very patch). Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 12 ------------ tools/libxl/libxl_dom.c | 35 +++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d6b8a29..8cc3ca5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -187,20 +187,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; - if (!b_info->cpumap.size) { - if (libxl_cpu_bitmap_alloc(CTX, &b_info->cpumap, 0)) - return ERROR_FAIL; - libxl_bitmap_set_any(&b_info->cpumap); - } - libxl_defbool_setdefault(&b_info->numa_placement, true); - if (!b_info->nodemap.size) { - if (libxl_node_bitmap_alloc(CTX, &b_info->nodemap, 0)) - return ERROR_FAIL; - libxl_bitmap_set_any(&b_info->nodemap); - } - if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) b_info->max_memkb = 32 * 1024; if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a90a8d5..49bfa66 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -241,28 +241,39 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, } /* - * Check if the domain has any CPU affinity. If not, try to build - * up one. In case numa_place_domain() find at least a suitable - * candidate, it will affect info->nodemap accordingly; if it - * does not, it just leaves it as it is. This means (unless - * some weird error manifests) the subsequent call to - * libxl_domain_set_nodeaffinity() will do the actual placement, - * whatever that turns out to be. + * Check if the domain has any CPU or node affinity already. If not, try + * to build up the latter via automatic NUMA placement. In fact, in case + * numa_place_domain() manage to find a placement, in info->nodemap is + * updated accordingly; if it does not manage, info->nodemap is just left + * alone. It is then the the subsequent call to + * libxl_domain_set_nodeaffinity() that enacts the actual placement. */ if (libxl_defbool_val(info->numa_placement)) { - if (!libxl_bitmap_is_full(&info->cpumap)) { + if (info->cpumap.size) { LOG(ERROR, "Can run NUMA placement only if no vcpu " - "affinity is specified"); + "affinity is specified explicitly"); return ERROR_INVAL; } + if (info->nodemap.size) { + LOG(ERROR, "Can run NUMA placement only if the domain does not " + "have any NUMA node affinity set already"); + return ERROR_INVAL; + } + + rc = libxl_node_bitmap_alloc(ctx, &info->nodemap, 0); + if (rc) + return rc; + libxl_bitmap_set_any(&info->nodemap); rc = numa_place_domain(gc, domid, info); if (rc) return rc; } - libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, - &info->cpumap, NULL); + if (info->nodemap.size) + libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); + if (info->cpumap.size) + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + &info->cpumap, NULL); if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 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 Jul 05 16:46:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6U-00019Z-Hc; Sat, 05 Jul 2014 16:46:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6T-00019H-4J for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:21 +0000 Received: from [193.109.254.147:7376] by server-4.bemta-14.messagelabs.com id 10/46-20586-CDB28B35; Sat, 05 Jul 2014 16:46:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404578778!15637652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25112 invoked from network); 5 Jul 2014 16:46:19 -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; 5 Jul 2014 16:46:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6Q-0006Cl-JU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6Q-0002PJ-IQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:18 +0000 Date: Sat, 05 Jul 2014 16:46:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change default for b_info->{cpu, node}map to "not 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 194e71830d8d09c9a75ed41abe02d3b8bb6ebe42 Author: Dario Faggioli AuthorDate: Fri Jun 20 18:19:29 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl: Change default for b_info->{cpu, node}map to "not allocated" by avoiding allocating them in libxl__domain_build_info_setdefault. In fact, back in 7e449837 ("libxl: provide _init and _setdefault for libxl_domain_build_info") and a5d30c23 ("libxl: allow for explicitly specifying node-affinity"), it was decided that the default for these fields was for them to be allocated and filled. That is now causing problem, whenever we have to figure out whether the caller is using or not one of those fields. In fact, when we see a full bitmap, is it just the default value, or is the user that wants it that way? Since that kind of knowledge has become important, change the default to be "bitmap not allocated". It then becomes easy to know whether a libxl caller is using one of the fields, just by checking whether the bitmap is actually there with a non-zero size. This is very important for the following patches introducing new ways of specifying hard and soft affinity. It also allows us to improve the checks around NUMA automatic placement, during domain creation (and that bit is done in this very patch). Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 12 ------------ tools/libxl/libxl_dom.c | 35 +++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d6b8a29..8cc3ca5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -187,20 +187,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; - if (!b_info->cpumap.size) { - if (libxl_cpu_bitmap_alloc(CTX, &b_info->cpumap, 0)) - return ERROR_FAIL; - libxl_bitmap_set_any(&b_info->cpumap); - } - libxl_defbool_setdefault(&b_info->numa_placement, true); - if (!b_info->nodemap.size) { - if (libxl_node_bitmap_alloc(CTX, &b_info->nodemap, 0)) - return ERROR_FAIL; - libxl_bitmap_set_any(&b_info->nodemap); - } - if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) b_info->max_memkb = 32 * 1024; if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a90a8d5..49bfa66 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -241,28 +241,39 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, } /* - * Check if the domain has any CPU affinity. If not, try to build - * up one. In case numa_place_domain() find at least a suitable - * candidate, it will affect info->nodemap accordingly; if it - * does not, it just leaves it as it is. This means (unless - * some weird error manifests) the subsequent call to - * libxl_domain_set_nodeaffinity() will do the actual placement, - * whatever that turns out to be. + * Check if the domain has any CPU or node affinity already. If not, try + * to build up the latter via automatic NUMA placement. In fact, in case + * numa_place_domain() manage to find a placement, in info->nodemap is + * updated accordingly; if it does not manage, info->nodemap is just left + * alone. It is then the the subsequent call to + * libxl_domain_set_nodeaffinity() that enacts the actual placement. */ if (libxl_defbool_val(info->numa_placement)) { - if (!libxl_bitmap_is_full(&info->cpumap)) { + if (info->cpumap.size) { LOG(ERROR, "Can run NUMA placement only if no vcpu " - "affinity is specified"); + "affinity is specified explicitly"); return ERROR_INVAL; } + if (info->nodemap.size) { + LOG(ERROR, "Can run NUMA placement only if the domain does not " + "have any NUMA node affinity set already"); + return ERROR_INVAL; + } + + rc = libxl_node_bitmap_alloc(ctx, &info->nodemap, 0); + if (rc) + return rc; + libxl_bitmap_set_any(&info->nodemap); rc = numa_place_domain(gc, domid, info); if (rc) return rc; } - libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, - &info->cpumap, NULL); + if (info->nodemap.size) + libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); + if (info->cpumap.size) + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + &info->cpumap, NULL); if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 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 Jul 05 16:46:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6f-0001Bp-Kf; Sat, 05 Jul 2014 16:46:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6e-0001BS-9C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:32 +0000 Received: from [85.158.137.68:61276] by server-14.bemta-3.messagelabs.com id B0/BD-19846-7EB28B35; Sat, 05 Jul 2014 16:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404578789!14199554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 508 invoked from network); 5 Jul 2014 16:46:30 -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 Jul 2014 16:46:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6a-0006Ct-Q4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6a-0002Pi-NW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:28 +0000 Date: Sat, 05 Jul 2014 16:46:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/xl: push VCPU affinity pinning down to libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5dbdcf6743ac032b53df645e2aab6251d667923 Author: Wei Liu AuthorDate: Fri Jun 20 18:19:37 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl/xl: push VCPU affinity pinning down to libxl This patch introduces an array of libxl_bitmap called "vcpu_hard_affinity" in libxl IDL to preserve VCPU to PCPU mapping. This is necessary for libxl to preserve all information to construct a domain. The array accommodates at most max_vcpus elements, each containing the affinity of the respective VCPU. If less than max_vcpus bitmaps are present, the VCPUs associated to the missing elements will just stay with their default affinity (they'll be free to execute on every PCPU). In case both this new field, and the already existing cpumap field are used, the content of the array will override what's set in cpumap. (In xl, we make sure that this never happens in xl, by using only one of the two at any given time.) The proper macro to mark the API change (called LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS) is added but it is commented. It will be uncommented by the patch in the series that completes the process, by adding the "vcpu_soft_affinity" array. This is because, after all, these two fields are being added sort-of together, and are very very similar, in both meaning and usage, so it makes sense for them to share the same marker. This patch was originally part of Wei's series about pushing as much information as possible on domain configuration in libxl, rather than xl. See here, for more details: http://lists.xen.org/archives/html/xen-devel/2014-06/msg01026.html http://lists.xen.org/archives/html/xen-devel/2014-06/msg01031.html Signed-off-by: Wei Liu Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl.h | 25 +++++++++++++ tools/libxl/libxl_dom.c | 17 ++++++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 79 ++++++++++-------------------------------- 4 files changed, 60 insertions(+), 62 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index a8477c9..d63cd11 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -340,6 +340,31 @@ typedef struct libxl__ctx libxl_ctx; #endif /* + * LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS + * + * If this is defined, then the libxl_domain_build_info structure will + * contain two arrays of libxl_bitmap-s, with all the necessary information + * to set the hard affinity (vcpu_hard_affinity) and the soft affinity + * (vcpu_soft_affinity) of the VCPUs. + * + * Note that, if the vcpu_hard_affinity array is used, libxl will ignore + * the content of the cpumap field of libxl_domain_build_info. That is to + * say, if the array is allocated and used by the caller, it is it and + * only it that determines the hard affinity of the domain's VCPUs. + * + * The number of libxl_bitmap-s in the arrays should be equal to the + * maximum number of VCPUs of the domain. If there only are N elements in + * an array, with N smaller the the maximum number of VCPUs, the hard or + * soft affinity (depending on which array we are talking about) will be + * set only for the first N VCPUs. The other VCPUs will just have affinity, + * both hard and soft, with all the host PCPUs. + * Each bitmap should be big enough to accommodate the maximum number of + * PCPUs of the host. + */ +/* to be uncommented when soft array added */ +/* #define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 */ + +/* * LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST * * If this is defined, then the libxl_domain_build_info structure will diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 49bfa66..015ccb3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -249,7 +249,7 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, * libxl_domain_set_nodeaffinity() that enacts the actual placement. */ if (libxl_defbool_val(info->numa_placement)) { - if (info->cpumap.size) { + if (info->cpumap.size || info->num_vcpu_hard_affinity) { LOG(ERROR, "Can run NUMA placement only if no vcpu " "affinity is specified explicitly"); return ERROR_INVAL; @@ -271,10 +271,23 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, } if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - if (info->cpumap.size) + /* As mentioned in libxl.h, vcpu_hard_array takes precedence */ + if (info->num_vcpu_hard_affinity) { + int i; + + for (i = 0; i < info->num_vcpu_hard_affinity; i++) { + if (libxl_set_vcpuaffinity(ctx, domid, i, + &info->vcpu_hard_affinity[i], + NULL)) { + LOG(ERROR, "setting affinity failed on vcpu `%d'", i); + return ERROR_FAIL; + } + } + } else if (info->cpumap.size) libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap, NULL); + if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't set max memory"); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 37df854..5607ea7 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -303,6 +303,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("avail_vcpus", libxl_bitmap), ("cpumap", libxl_bitmap), ("nodemap", libxl_bitmap), + ("vcpu_hard_affinity", Array(libxl_bitmap, "num_vcpu_hard_affinity")), ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4d5e0d5..e2d3ad0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -88,9 +88,6 @@ xlchild children[child_max]; static const char *common_domname; static int fd_lock = -1; -/* Stash for specific vcpu to pcpu mappping */ -static int *vcpu_to_pcpu; - static const char savefileheader_magic[32]= "Xen saved domain, xl format\n \0 \r"; @@ -703,7 +700,7 @@ static void parse_config_data(const char *config_source, XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem; + int num_ioports, num_irqs, num_iomem, num_cpus; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -800,43 +797,32 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { - int n_cpus = 0; + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { + int j = 0; - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { - fprintf(stderr, "Unable to allocate cpumap\n"); - exit(1); - } + /* Silently ignore values corresponding to non existing vcpus */ + if (num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; - /* Prepare the array for single vcpu to pcpu mappings */ - vcpu_to_pcpu = xmalloc(sizeof(int) * b_info->max_vcpus); - memset(vcpu_to_pcpu, -1, sizeof(int) * b_info->max_vcpus); + b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); - /* - * Idea here is to let libxl think all the domain's vcpus - * have cpu affinity with all the pcpus on the list. - * It is then us, here in xl, that matches each single vcpu - * to its pcpu (and that's why we need to stash such info in - * the vcpu_to_pcpu array now) after the domain has been created. - * Doing it like this saves the burden of passing to libxl - * some big array hosting the single mappings. Also, using - * the cpumap derived from the list ensures memory is being - * allocated on the proper nodes anyway. - */ - libxl_bitmap_set_none(&b_info->cpumap); - while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { + while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { i = atoi(buf); - if (!libxl_bitmap_cpu_valid(&b_info->cpumap, i)) { - fprintf(stderr, "cpu %d illegal\n", i); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[j], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - libxl_bitmap_set(&b_info->cpumap, i); - if (n_cpus < b_info->max_vcpus) - vcpu_to_pcpu[n_cpus] = i; - n_cpus++; + libxl_bitmap_set_none(&b_info->vcpu_hard_affinity[j]); + libxl_bitmap_set(&b_info->vcpu_hard_affinity[j], i); + + j++; } + b_info->num_vcpu_hard_affinity = num_cpus; - /* We have a cpumap, disable automatic placement */ + /* We have a list of cpumaps, disable automatic placement */ libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { @@ -2183,33 +2169,6 @@ start: if ( ret ) goto error_out; - /* If single vcpu to pcpu mapping was requested, honour it */ - if (vcpu_to_pcpu) { - libxl_bitmap vcpu_cpumap; - - ret = libxl_cpu_bitmap_alloc(ctx, &vcpu_cpumap, 0); - if (ret) - goto error_out; - for (i = 0; i < d_config.b_info.max_vcpus; i++) { - - if (vcpu_to_pcpu[i] != -1) { - libxl_bitmap_set_none(&vcpu_cpumap); - libxl_bitmap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); - } else { - libxl_bitmap_set_any(&vcpu_cpumap); - } - if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap, NULL)) { - fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); - libxl_bitmap_dispose(&vcpu_cpumap); - free(vcpu_to_pcpu); - ret = ERROR_FAIL; - goto error_out; - } - } - libxl_bitmap_dispose(&vcpu_cpumap); - free(vcpu_to_pcpu); vcpu_to_pcpu = NULL; - } - ret = libxl_userdata_store(ctx, domid, "xl", config_data, config_len); if (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 Sat Jul 05 16:46:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6f-0001Bp-Kf; Sat, 05 Jul 2014 16:46:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6e-0001BS-9C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:32 +0000 Received: from [85.158.137.68:61276] by server-14.bemta-3.messagelabs.com id B0/BD-19846-7EB28B35; Sat, 05 Jul 2014 16:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404578789!14199554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 508 invoked from network); 5 Jul 2014 16:46:30 -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 Jul 2014 16:46:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6a-0006Ct-Q4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6a-0002Pi-NW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:28 +0000 Date: Sat, 05 Jul 2014 16:46:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/xl: push VCPU affinity pinning down to libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5dbdcf6743ac032b53df645e2aab6251d667923 Author: Wei Liu AuthorDate: Fri Jun 20 18:19:37 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 libxl/xl: push VCPU affinity pinning down to libxl This patch introduces an array of libxl_bitmap called "vcpu_hard_affinity" in libxl IDL to preserve VCPU to PCPU mapping. This is necessary for libxl to preserve all information to construct a domain. The array accommodates at most max_vcpus elements, each containing the affinity of the respective VCPU. If less than max_vcpus bitmaps are present, the VCPUs associated to the missing elements will just stay with their default affinity (they'll be free to execute on every PCPU). In case both this new field, and the already existing cpumap field are used, the content of the array will override what's set in cpumap. (In xl, we make sure that this never happens in xl, by using only one of the two at any given time.) The proper macro to mark the API change (called LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS) is added but it is commented. It will be uncommented by the patch in the series that completes the process, by adding the "vcpu_soft_affinity" array. This is because, after all, these two fields are being added sort-of together, and are very very similar, in both meaning and usage, so it makes sense for them to share the same marker. This patch was originally part of Wei's series about pushing as much information as possible on domain configuration in libxl, rather than xl. See here, for more details: http://lists.xen.org/archives/html/xen-devel/2014-06/msg01026.html http://lists.xen.org/archives/html/xen-devel/2014-06/msg01031.html Signed-off-by: Wei Liu Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl.h | 25 +++++++++++++ tools/libxl/libxl_dom.c | 17 ++++++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 79 ++++++++++-------------------------------- 4 files changed, 60 insertions(+), 62 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index a8477c9..d63cd11 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -340,6 +340,31 @@ typedef struct libxl__ctx libxl_ctx; #endif /* + * LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS + * + * If this is defined, then the libxl_domain_build_info structure will + * contain two arrays of libxl_bitmap-s, with all the necessary information + * to set the hard affinity (vcpu_hard_affinity) and the soft affinity + * (vcpu_soft_affinity) of the VCPUs. + * + * Note that, if the vcpu_hard_affinity array is used, libxl will ignore + * the content of the cpumap field of libxl_domain_build_info. That is to + * say, if the array is allocated and used by the caller, it is it and + * only it that determines the hard affinity of the domain's VCPUs. + * + * The number of libxl_bitmap-s in the arrays should be equal to the + * maximum number of VCPUs of the domain. If there only are N elements in + * an array, with N smaller the the maximum number of VCPUs, the hard or + * soft affinity (depending on which array we are talking about) will be + * set only for the first N VCPUs. The other VCPUs will just have affinity, + * both hard and soft, with all the host PCPUs. + * Each bitmap should be big enough to accommodate the maximum number of + * PCPUs of the host. + */ +/* to be uncommented when soft array added */ +/* #define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 */ + +/* * LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST * * If this is defined, then the libxl_domain_build_info structure will diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 49bfa66..015ccb3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -249,7 +249,7 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, * libxl_domain_set_nodeaffinity() that enacts the actual placement. */ if (libxl_defbool_val(info->numa_placement)) { - if (info->cpumap.size) { + if (info->cpumap.size || info->num_vcpu_hard_affinity) { LOG(ERROR, "Can run NUMA placement only if no vcpu " "affinity is specified explicitly"); return ERROR_INVAL; @@ -271,10 +271,23 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, } if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - if (info->cpumap.size) + /* As mentioned in libxl.h, vcpu_hard_array takes precedence */ + if (info->num_vcpu_hard_affinity) { + int i; + + for (i = 0; i < info->num_vcpu_hard_affinity; i++) { + if (libxl_set_vcpuaffinity(ctx, domid, i, + &info->vcpu_hard_affinity[i], + NULL)) { + LOG(ERROR, "setting affinity failed on vcpu `%d'", i); + return ERROR_FAIL; + } + } + } else if (info->cpumap.size) libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap, NULL); + if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't set max memory"); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 37df854..5607ea7 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -303,6 +303,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("avail_vcpus", libxl_bitmap), ("cpumap", libxl_bitmap), ("nodemap", libxl_bitmap), + ("vcpu_hard_affinity", Array(libxl_bitmap, "num_vcpu_hard_affinity")), ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4d5e0d5..e2d3ad0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -88,9 +88,6 @@ xlchild children[child_max]; static const char *common_domname; static int fd_lock = -1; -/* Stash for specific vcpu to pcpu mappping */ -static int *vcpu_to_pcpu; - static const char savefileheader_magic[32]= "Xen saved domain, xl format\n \0 \r"; @@ -703,7 +700,7 @@ static void parse_config_data(const char *config_source, XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem; + int num_ioports, num_irqs, num_iomem, num_cpus; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -800,43 +797,32 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { - int n_cpus = 0; + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { + int j = 0; - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { - fprintf(stderr, "Unable to allocate cpumap\n"); - exit(1); - } + /* Silently ignore values corresponding to non existing vcpus */ + if (num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; - /* Prepare the array for single vcpu to pcpu mappings */ - vcpu_to_pcpu = xmalloc(sizeof(int) * b_info->max_vcpus); - memset(vcpu_to_pcpu, -1, sizeof(int) * b_info->max_vcpus); + b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); - /* - * Idea here is to let libxl think all the domain's vcpus - * have cpu affinity with all the pcpus on the list. - * It is then us, here in xl, that matches each single vcpu - * to its pcpu (and that's why we need to stash such info in - * the vcpu_to_pcpu array now) after the domain has been created. - * Doing it like this saves the burden of passing to libxl - * some big array hosting the single mappings. Also, using - * the cpumap derived from the list ensures memory is being - * allocated on the proper nodes anyway. - */ - libxl_bitmap_set_none(&b_info->cpumap); - while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { + while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { i = atoi(buf); - if (!libxl_bitmap_cpu_valid(&b_info->cpumap, i)) { - fprintf(stderr, "cpu %d illegal\n", i); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[j], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - libxl_bitmap_set(&b_info->cpumap, i); - if (n_cpus < b_info->max_vcpus) - vcpu_to_pcpu[n_cpus] = i; - n_cpus++; + libxl_bitmap_set_none(&b_info->vcpu_hard_affinity[j]); + libxl_bitmap_set(&b_info->vcpu_hard_affinity[j], i); + + j++; } + b_info->num_vcpu_hard_affinity = num_cpus; - /* We have a cpumap, disable automatic placement */ + /* We have a list of cpumaps, disable automatic placement */ libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { @@ -2183,33 +2169,6 @@ start: if ( ret ) goto error_out; - /* If single vcpu to pcpu mapping was requested, honour it */ - if (vcpu_to_pcpu) { - libxl_bitmap vcpu_cpumap; - - ret = libxl_cpu_bitmap_alloc(ctx, &vcpu_cpumap, 0); - if (ret) - goto error_out; - for (i = 0; i < d_config.b_info.max_vcpus; i++) { - - if (vcpu_to_pcpu[i] != -1) { - libxl_bitmap_set_none(&vcpu_cpumap); - libxl_bitmap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); - } else { - libxl_bitmap_set_any(&vcpu_cpumap); - } - if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap, NULL)) { - fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); - libxl_bitmap_dispose(&vcpu_cpumap); - free(vcpu_to_pcpu); - ret = ERROR_FAIL; - goto error_out; - } - } - libxl_bitmap_dispose(&vcpu_cpumap); - free(vcpu_to_pcpu); vcpu_to_pcpu = NULL; - } - ret = libxl_userdata_store(ctx, domid, "xl", config_data, config_len); if (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 Sat Jul 05 16:46:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6o-0001Dp-PT; Sat, 05 Jul 2014 16:46:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6n-0001DX-GF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:41 +0000 Received: from [85.158.139.211:27365] by server-1.bemta-5.messagelabs.com id 3E/F0-30932-0FB28B35; Sat, 05 Jul 2014 16:46:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404578799!13814379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17974 invoked from network); 5 Jul 2014 16:46:40 -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; 5 Jul 2014 16:46:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6k-0006Cz-V7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6k-0002QA-Tw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:38 +0000 Date: Sat, 05 Jul 2014 16:46:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: build fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf11bf940f20e7428ed0a9610c66259de341adc6 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:18 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: build fixes Make .o rules depend on the includes. Before, only the final link step depended on setting up the includes directory, making parallel builds unreliable. Make symlinks use explicit make rules instead of using a phony target. Avoids unnecessary rebuilds. [talex5@gmail.com: bring back "make links", for stubdom] Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/Makefile | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 50d038b..6d6537e 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -50,6 +50,11 @@ flags-$(CONFIG_XENBUS) += -DCONFIG_XENBUS DEF_CFLAGS += $(flags-y) +# Symlinks and headers that must be created before building the C files +GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/xen include/$(TARGET_ARCH_FAM)/mini-os + +EXTRA_DEPS += $(GENERATED_HEADERS) + # Include common mini-os makerules. include minios.mk @@ -124,11 +129,18 @@ include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $ perl $^ --prefix=minios >$@.new $(call move-if-changed,$@.new,$@) +# Used by stubdom's Makefile .PHONY: links -links: include/list.h $(ARCH_LINKS) - [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen - [ -e include/mini-os ] || ln -sf . include/mini-os - [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os +links: $(GENERATED_HEADERS) + +include/xen: + ln -sf ../../../xen/include/public $@ + +include/mini-os: + ln -sf . $@ + +include/$(TARGET_ARCH_FAM)/mini-os: + ln -sf . $@ .PHONY: arch_lib arch_lib: @@ -174,7 +186,7 @@ ifneq ($(APP_OBJS),) APP_O=$(OBJ_DIR)/$(TARGET)_app.o endif -$(OBJ_DIR)/$(TARGET): links include/list.h $(OBJS) $(APP_O) arch_lib +$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ @@ -212,4 +224,3 @@ tags: .PHONY: TAGS TAGS: $(all_sources) | xargs etags - -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6o-0001Dp-PT; Sat, 05 Jul 2014 16:46:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6n-0001DX-GF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:41 +0000 Received: from [85.158.139.211:27365] by server-1.bemta-5.messagelabs.com id 3E/F0-30932-0FB28B35; Sat, 05 Jul 2014 16:46:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404578799!13814379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17974 invoked from network); 5 Jul 2014 16:46:40 -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; 5 Jul 2014 16:46:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6k-0006Cz-V7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6k-0002QA-Tw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:38 +0000 Date: Sat, 05 Jul 2014 16:46:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: build fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf11bf940f20e7428ed0a9610c66259de341adc6 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:18 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: build fixes Make .o rules depend on the includes. Before, only the final link step depended on setting up the includes directory, making parallel builds unreliable. Make symlinks use explicit make rules instead of using a phony target. Avoids unnecessary rebuilds. [talex5@gmail.com: bring back "make links", for stubdom] Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/Makefile | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 50d038b..6d6537e 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -50,6 +50,11 @@ flags-$(CONFIG_XENBUS) += -DCONFIG_XENBUS DEF_CFLAGS += $(flags-y) +# Symlinks and headers that must be created before building the C files +GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/xen include/$(TARGET_ARCH_FAM)/mini-os + +EXTRA_DEPS += $(GENERATED_HEADERS) + # Include common mini-os makerules. include minios.mk @@ -124,11 +129,18 @@ include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $ perl $^ --prefix=minios >$@.new $(call move-if-changed,$@.new,$@) +# Used by stubdom's Makefile .PHONY: links -links: include/list.h $(ARCH_LINKS) - [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen - [ -e include/mini-os ] || ln -sf . include/mini-os - [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os +links: $(GENERATED_HEADERS) + +include/xen: + ln -sf ../../../xen/include/public $@ + +include/mini-os: + ln -sf . $@ + +include/$(TARGET_ARCH_FAM)/mini-os: + ln -sf . $@ .PHONY: arch_lib arch_lib: @@ -174,7 +186,7 @@ ifneq ($(APP_OBJS),) APP_O=$(OBJ_DIR)/$(TARGET)_app.o endif -$(OBJ_DIR)/$(TARGET): links include/list.h $(OBJS) $(APP_O) arch_lib +$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ @@ -212,4 +224,3 @@ tags: .PHONY: TAGS TAGS: $(all_sources) | xargs etags - -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:46:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6y-0001G3-SS; Sat, 05 Jul 2014 16:46:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6x-0001Fl-R4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:51 +0000 Received: from [193.109.254.147:2433] by server-3.bemta-14.messagelabs.com id F0/8F-13460-BFB28B35; Sat, 05 Jul 2014 16:46:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1404578809!15662600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13469 invoked from network); 5 Jul 2014 16:46:50 -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; 5 Jul 2014 16:46:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6v-0006D5-4G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6v-0002QZ-2J for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:49 +0000 Date: Sat, 05 Jul 2014 16:46:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fixed shutdown thread X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f04e5b76c9ac1d367487b84f011caefc2fa97e5 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:19 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: fixed shutdown thread Before, it read "" and started a shutdown immediately. Now, it waits for a non-empty value and then actually shuts down. Acked-by: Samuel Thibault [talex5@gmail.com: avoid declaration-after-statement in kernel.c] Signed-off-by: Thomas Leonard --- extras/mini-os/kernel.c | 10 +++++++--- extras/mini-os/main.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index ea409f4..c7410db 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -68,7 +68,9 @@ void setup_xen_features(void) /* This should be overridden by the application we are linked against. */ __attribute__((weak)) void app_shutdown(unsigned reason) { + struct sched_shutdown sched_shutdown = { .reason = reason }; printk("Shutdown requested: %d\n", reason); + HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown); } static void shutdown_thread(void *p) @@ -76,12 +78,14 @@ static void shutdown_thread(void *p) const char *path = "control/shutdown"; const char *token = path; xenbus_event_queue events = NULL; - char *shutdown, *err; + char *shutdown = NULL, *err; unsigned int shutdown_reason; xenbus_watch_path_token(XBT_NIL, path, token, &events); - while ((err = xenbus_read(XBT_NIL, path, &shutdown)) != NULL) + while ((err = xenbus_read(XBT_NIL, path, &shutdown)) != NULL || !strcmp(shutdown, "")) { free(err); + free(shutdown); + shutdown = NULL; xenbus_wait_for_watch(&events); } err = xenbus_unwatch_path_token(XBT_NIL, path, token); @@ -106,7 +110,7 @@ static void shutdown_thread(void *p) /* This should be overridden by the application we are linked against. */ __attribute__((weak)) int app_main(start_info_t *si) { - printk("Dummy main: start_info=%p\n", si); + printk("kernel.c: dummy main: start_info=%p\n", si); return 0; } diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c index 73eb6fb..aec0586 100644 --- a/extras/mini-os/main.c +++ b/extras/mini-os/main.c @@ -185,7 +185,7 @@ void _exit(int ret) int app_main(start_info_t *si) { - printk("Dummy main: start_info=%p\n", si); + printk("main.c: dummy main: start_info=%p\n", si); main_thread = create_thread("main", call_main, si); 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 Jul 05 16:46:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:46: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 1X3T6y-0001G3-SS; Sat, 05 Jul 2014 16:46:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6x-0001Fl-R4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:51 +0000 Received: from [193.109.254.147:2433] by server-3.bemta-14.messagelabs.com id F0/8F-13460-BFB28B35; Sat, 05 Jul 2014 16:46:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1404578809!15662600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13469 invoked from network); 5 Jul 2014 16:46:50 -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; 5 Jul 2014 16:46:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T6v-0006D5-4G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T6v-0002QZ-2J for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:49 +0000 Date: Sat, 05 Jul 2014 16:46:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fixed shutdown thread X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f04e5b76c9ac1d367487b84f011caefc2fa97e5 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:19 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: fixed shutdown thread Before, it read "" and started a shutdown immediately. Now, it waits for a non-empty value and then actually shuts down. Acked-by: Samuel Thibault [talex5@gmail.com: avoid declaration-after-statement in kernel.c] Signed-off-by: Thomas Leonard --- extras/mini-os/kernel.c | 10 +++++++--- extras/mini-os/main.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index ea409f4..c7410db 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -68,7 +68,9 @@ void setup_xen_features(void) /* This should be overridden by the application we are linked against. */ __attribute__((weak)) void app_shutdown(unsigned reason) { + struct sched_shutdown sched_shutdown = { .reason = reason }; printk("Shutdown requested: %d\n", reason); + HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown); } static void shutdown_thread(void *p) @@ -76,12 +78,14 @@ static void shutdown_thread(void *p) const char *path = "control/shutdown"; const char *token = path; xenbus_event_queue events = NULL; - char *shutdown, *err; + char *shutdown = NULL, *err; unsigned int shutdown_reason; xenbus_watch_path_token(XBT_NIL, path, token, &events); - while ((err = xenbus_read(XBT_NIL, path, &shutdown)) != NULL) + while ((err = xenbus_read(XBT_NIL, path, &shutdown)) != NULL || !strcmp(shutdown, "")) { free(err); + free(shutdown); + shutdown = NULL; xenbus_wait_for_watch(&events); } err = xenbus_unwatch_path_token(XBT_NIL, path, token); @@ -106,7 +110,7 @@ static void shutdown_thread(void *p) /* This should be overridden by the application we are linked against. */ __attribute__((weak)) int app_main(start_info_t *si) { - printk("Dummy main: start_info=%p\n", si); + printk("kernel.c: dummy main: start_info=%p\n", si); return 0; } diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c index 73eb6fb..aec0586 100644 --- a/extras/mini-os/main.c +++ b/extras/mini-os/main.c @@ -185,7 +185,7 @@ void _exit(int ret) int app_main(start_info_t *si) { - printk("Dummy main: start_info=%p\n", si); + printk("main.c: dummy main: start_info=%p\n", si); main_thread = create_thread("main", call_main, si); 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 Jul 05 16:47:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T79-0001Hx-VI; Sat, 05 Jul 2014 16:47:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T78-0001HW-No for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:03 +0000 Received: from [193.109.254.147:12268] by server-12.bemta-14.messagelabs.com id 18/0A-20682-60C28B35; Sat, 05 Jul 2014 16:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404578819!15688202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23141 invoked from network); 5 Jul 2014 16:47:00 -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; 5 Jul 2014 16:47:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T75-0006DE-9C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T75-0002R3-7i for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:59 +0000 Date: Sat, 05 Jul 2014 16:46:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fixed format string error in unbind_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 549a29fcd81ff10783e6c9bce93255218fed79fb Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:20 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: fixed format string error in unbind_evtchn Would crash if HYPERVISOR_event_channel_op returned an error code. The other changes in this commit are just fixing indentation. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/events.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index d60630b..f708cb4 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -109,24 +109,23 @@ evtchn_port_t bind_evtchn(evtchn_port_t port, evtchn_handler_t handler, void unbind_evtchn(evtchn_port_t port ) { - struct evtchn_close close; + struct evtchn_close close; int rc; - if ( ev_actions[port].handler == default_handler ) - printk("WARN: No handler for port %d when unbinding\n", port); - mask_evtchn(port); - clear_evtchn(port); + if ( ev_actions[port].handler == default_handler ) + printk("WARN: No handler for port %d when unbinding\n", port); + mask_evtchn(port); + clear_evtchn(port); - ev_actions[port].handler = default_handler; - wmb(); - ev_actions[port].data = NULL; - clear_bit(port, bound_ports); + ev_actions[port].handler = default_handler; + wmb(); + ev_actions[port].data = NULL; + clear_bit(port, bound_ports); - close.port = port; - rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); + close.port = port; + rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); if ( rc ) - printk("WARN: close_port %s failed rc=%d. ignored\n", port, rc); - + printk("WARN: close_port %d failed rc=%d. ignored\n", port, rc); } evtchn_port_t bind_virq(uint32_t virq, evtchn_handler_t handler, void *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 Sat Jul 05 16:47:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T79-0001Hx-VI; Sat, 05 Jul 2014 16:47:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T78-0001HW-No for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:03 +0000 Received: from [193.109.254.147:12268] by server-12.bemta-14.messagelabs.com id 18/0A-20682-60C28B35; Sat, 05 Jul 2014 16:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404578819!15688202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23141 invoked from network); 5 Jul 2014 16:47:00 -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; 5 Jul 2014 16:47:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T75-0006DE-9C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T75-0002R3-7i for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:46:59 +0000 Date: Sat, 05 Jul 2014 16:46:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fixed format string error in unbind_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 549a29fcd81ff10783e6c9bce93255218fed79fb Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:20 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:33 2014 +0100 mini-os: fixed format string error in unbind_evtchn Would crash if HYPERVISOR_event_channel_op returned an error code. The other changes in this commit are just fixing indentation. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/events.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index d60630b..f708cb4 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -109,24 +109,23 @@ evtchn_port_t bind_evtchn(evtchn_port_t port, evtchn_handler_t handler, void unbind_evtchn(evtchn_port_t port ) { - struct evtchn_close close; + struct evtchn_close close; int rc; - if ( ev_actions[port].handler == default_handler ) - printk("WARN: No handler for port %d when unbinding\n", port); - mask_evtchn(port); - clear_evtchn(port); + if ( ev_actions[port].handler == default_handler ) + printk("WARN: No handler for port %d when unbinding\n", port); + mask_evtchn(port); + clear_evtchn(port); - ev_actions[port].handler = default_handler; - wmb(); - ev_actions[port].data = NULL; - clear_bit(port, bound_ports); + ev_actions[port].handler = default_handler; + wmb(); + ev_actions[port].data = NULL; + clear_bit(port, bound_ports); - close.port = port; - rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); + close.port = port; + rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); if ( rc ) - printk("WARN: close_port %s failed rc=%d. ignored\n", port, rc); - + printk("WARN: close_port %d failed rc=%d. ignored\n", port, rc); } evtchn_port_t bind_virq(uint32_t virq, evtchn_handler_t handler, void *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 Sat Jul 05 16:47:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7J-0001K1-1w; Sat, 05 Jul 2014 16:47:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7I-0001Jd-9Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:12 +0000 Received: from [85.158.137.68:4580] by server-16.bemta-3.messagelabs.com id 01/FF-28986-F0C28B35; Sat, 05 Jul 2014 16:47:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404578829!14160322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8983 invoked from network); 5 Jul 2014 16:47:10 -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 Jul 2014 16:47:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7F-0006Dn-F8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7F-0002SJ-Ca for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:09 +0000 Date: Sat, 05 Jul 2014 16:47:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use unbind_evtchn in unbind_all_ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18b4aee830c3c39d29c119308faaad8c6b536df7 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:21 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: use unbind_evtchn in unbind_all_ports This marks the channel as closed, in case someone tries to use it again. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/events.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index f708cb4..3c92d82 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -43,7 +43,6 @@ void unbind_all_ports(void) int cpu = 0; shared_info_t *s = HYPERVISOR_shared_info; vcpu_info_t *vcpu_info = &s->vcpu_info[cpu]; - int rc; for ( i = 0; i < NR_EVS; i++ ) { @@ -53,14 +52,8 @@ void unbind_all_ports(void) if ( test_and_clear_bit(i, bound_ports) ) { - struct evtchn_close close; printk("port %d still bound!\n", i); - mask_evtchn(i); - close.port = i; - rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); - if ( rc ) - printk("WARN: close_port %s failed rc=%d. ignored\n", i, rc); - clear_evtchn(i); + unbind_evtchn(i); } } vcpu_info->evtchn_upcall_pending = 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 Jul 05 16:47:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7J-0001K1-1w; Sat, 05 Jul 2014 16:47:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7I-0001Jd-9Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:12 +0000 Received: from [85.158.137.68:4580] by server-16.bemta-3.messagelabs.com id 01/FF-28986-F0C28B35; Sat, 05 Jul 2014 16:47:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404578829!14160322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8983 invoked from network); 5 Jul 2014 16:47:10 -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 Jul 2014 16:47:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7F-0006Dn-F8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7F-0002SJ-Ca for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:09 +0000 Date: Sat, 05 Jul 2014 16:47:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use unbind_evtchn in unbind_all_ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18b4aee830c3c39d29c119308faaad8c6b536df7 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:21 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: use unbind_evtchn in unbind_all_ports This marks the channel as closed, in case someone tries to use it again. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/events.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index f708cb4..3c92d82 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -43,7 +43,6 @@ void unbind_all_ports(void) int cpu = 0; shared_info_t *s = HYPERVISOR_shared_info; vcpu_info_t *vcpu_info = &s->vcpu_info[cpu]; - int rc; for ( i = 0; i < NR_EVS; i++ ) { @@ -53,14 +52,8 @@ void unbind_all_ports(void) if ( test_and_clear_bit(i, bound_ports) ) { - struct evtchn_close close; printk("port %d still bound!\n", i); - mask_evtchn(i); - close.port = i; - rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); - if ( rc ) - printk("WARN: close_port %s failed rc=%d. ignored\n", i, rc); - clear_evtchn(i); + unbind_evtchn(i); } } vcpu_info->evtchn_upcall_pending = 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 Jul 05 16:47:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7T-0001Ly-4c; Sat, 05 Jul 2014 16:47:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7S-0001Li-Cl for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:22 +0000 Received: from [85.158.137.68:41038] by server-15.bemta-3.messagelabs.com id E8/6F-26980-91C28B35; Sat, 05 Jul 2014 16:47:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1404578839!14234151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11294 invoked from network); 5 Jul 2014 16:47:20 -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 Jul 2014 16:47:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7P-0006Dt-Ll for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7P-0002Sh-J0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:19 +0000 Date: Sat, 05 Jul 2014 16:47:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: made off_t type signed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6e9178431725c369aeac117badc546edf18ab07 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: made off_t type signed POSIX requires this. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/include/types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index 6640ede..de356e8 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -73,7 +73,7 @@ typedef unsigned long uint64_t; #endif typedef uint64_t uintmax_t; typedef int64_t intmax_t; -typedef uint64_t off_t; +typedef int64_t off_t; #endif typedef intptr_t ptrdiff_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 Jul 05 16:47:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7T-0001Ly-4c; Sat, 05 Jul 2014 16:47:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7S-0001Li-Cl for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:22 +0000 Received: from [85.158.137.68:41038] by server-15.bemta-3.messagelabs.com id E8/6F-26980-91C28B35; Sat, 05 Jul 2014 16:47:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1404578839!14234151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11294 invoked from network); 5 Jul 2014 16:47:20 -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 Jul 2014 16:47:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7P-0006Dt-Ll for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7P-0002Sh-J0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:19 +0000 Date: Sat, 05 Jul 2014 16:47:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: made off_t type signed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6e9178431725c369aeac117badc546edf18ab07 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: made off_t type signed POSIX requires this. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/include/types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index 6640ede..de356e8 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -73,7 +73,7 @@ typedef unsigned long uint64_t; #endif typedef uint64_t uintmax_t; typedef int64_t intmax_t; -typedef uint64_t off_t; +typedef int64_t off_t; #endif typedef intptr_t ptrdiff_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 Jul 05 16:47:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7e-0001No-7D; Sat, 05 Jul 2014 16:47:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7d-0001NX-2l for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:33 +0000 Received: from [85.158.137.68:5055] by server-16.bemta-3.messagelabs.com id EE/00-28986-42C28B35; Sat, 05 Jul 2014 16:47:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1404578850!14254901!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21906 invoked from network); 5 Jul 2014 16:47:31 -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; 5 Jul 2014 16:47:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7Z-0006E1-SN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7Z-0002T4-PT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:29 +0000 Date: Sat, 05 Jul 2014 16:47:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: switched initial C entry point to arch_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 4db67cf657fe0194b56f042c3a89c29bca1e19a9 Author: Karim Raslan AuthorDate: Thu Jun 26 12:28:23 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: switched initial C entry point to arch_init Signed-off-by: Karim Allah Ahmed [talex5@gmail.com: separated from big ARM commit] [talex5@gmail.com: restored comment, moved prototypes to headers] Acked-by: Samuel Thibault [talex5@gmail.com: restored stack address printk on x86] [talex5@gmail.com: moved first printk's after start_info setup on x86] Signed-off-by: Thomas Leonard --- extras/mini-os/arch/x86/setup.c | 44 +++++++++++++++++++++++++++++++------- extras/mini-os/arch/x86/x86_32.S | 2 +- extras/mini-os/arch/x86/x86_64.S | 2 +- extras/mini-os/include/kernel.h | 6 +++- extras/mini-os/include/x86/os.h | 2 - extras/mini-os/kernel.c | 37 +++---------------------------- 6 files changed, 46 insertions(+), 47 deletions(-) diff --git a/extras/mini-os/arch/x86/setup.c b/extras/mini-os/arch/x86/setup.c index 54046d3..5e87dd1 100644 --- a/extras/mini-os/arch/x86/setup.c +++ b/extras/mini-os/arch/x86/setup.c @@ -28,6 +28,8 @@ #include #include /* for printk, memcpy */ +#include +#include /* * Shared page for communicating with the hypervisor. @@ -87,20 +89,45 @@ static inline void sse_init(void) { #define sse_init() #endif + +/* + * INITIAL C ENTRY POINT. + */ void arch_init(start_info_t *si) { + static char hello[] = "Bootstrapping...\n"; + + (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); + + trap_init(); + /*Initialize floating point unit */ - fpu_init(); + fpu_init(); - /* Initialize SSE */ - sse_init(); + /* Initialize SSE */ + sse_init(); /* Copy the start_info struct to a globally-accessible area. */ /* WARN: don't do printk before here, it uses information from shared_info. Use xprintk instead. */ memcpy(&start_info, si, sizeof(*si)); + /* print out some useful information */ + printk("Xen Minimal OS!\n"); + printk(" start_info: %p(VA)\n", si); + printk(" nr_pages: 0x%lx\n", si->nr_pages); + printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info); + printk(" pt_base: %p(VA)\n", (void *)si->pt_base); + printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); + printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); + printk(" mod_start: 0x%lx(VA)\n", si->mod_start); + printk(" mod_len: %lu\n", si->mod_len); + printk(" flags: 0x%x\n", (unsigned int)si->flags); + printk(" cmd_line: %s\n", + si->cmd_line ? (const char *)si->cmd_line : "NULL"); + printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); + /* set up minimal memory infos */ phys_to_machine_mapping = (unsigned long *)start_info.mfn_list; @@ -118,12 +145,15 @@ arch_init(start_info_t *si) (unsigned long)failsafe_callback, 0); #endif - + start_kernel(); } void arch_fini(void) { + /* Reset traps */ + trap_fini(); + #ifdef __i386__ HYPERVISOR_set_callbacks(0, 0, 0, 0); #else @@ -132,9 +162,7 @@ arch_fini(void) } void -arch_print_info(void) +arch_do_exit(void) { - printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); + stack_walk(); } - - diff --git a/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os/arch/x86/x86_32.S index fb3e30a..b9aa392 100644 --- a/extras/mini-os/arch/x86/x86_32.S +++ b/extras/mini-os/arch/x86/x86_32.S @@ -20,7 +20,7 @@ _start: lss stack_start,%esp andl $(~(__STACK_SIZE-1)), %esp push %esi - call start_kernel + call arch_init stack_start: .long stack+(2*__STACK_SIZE), __KERNEL_SS diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index f022eb3..df3469e 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -21,7 +21,7 @@ _start: movq stack_start(%rip),%rsp andq $(~(__STACK_SIZE-1)), %rsp movq %rsi,%rdi - call start_kernel + call arch_init stack_start: .quad stack+(2*__STACK_SIZE) diff --git a/extras/mini-os/include/kernel.h b/extras/mini-os/include/kernel.h index b36f172..13e3274 100644 --- a/extras/mini-os/include/kernel.h +++ b/extras/mini-os/include/kernel.h @@ -1,7 +1,9 @@ #ifndef _KERNEL_H_ #define _KERNEL_H_ -extern void do_exit(void) __attribute__((noreturn)); -extern void stop_kernel(void); +void start_kernel(void); +void do_exit(void) __attribute__((noreturn)); +void arch_do_exit(void); +void stop_kernel(void); #endif /* _KERNEL_H_ */ diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index f193865..73b8297 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -64,8 +64,6 @@ extern shared_info_t *HYPERVISOR_shared_info; void trap_init(void); void trap_fini(void); -void arch_init(start_info_t *si); -void arch_print_info(void); void arch_fini(void); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index c7410db..9a30550 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -28,6 +28,7 @@ */ #include +#include #include #include #include @@ -114,41 +115,14 @@ __attribute__((weak)) int app_main(start_info_t *si) return 0; } -/* - * INITIAL C ENTRY POINT. - */ -void start_kernel(start_info_t *si) +void start_kernel(void) { - static char hello[] = "Bootstrapping...\n"; - - (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); - - arch_init(si); - - trap_init(); - - /* print out some useful information */ - printk("Xen Minimal OS!\n"); - printk(" start_info: %p(VA)\n", si); - printk(" nr_pages: 0x%lx\n", si->nr_pages); - printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info); - printk(" pt_base: %p(VA)\n", (void *)si->pt_base); - printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); - printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); - printk(" mod_start: 0x%lx(VA)\n", si->mod_start); - printk(" mod_len: %lu\n", si->mod_len); - printk(" flags: 0x%x\n", (unsigned int)si->flags); - printk(" cmd_line: %s\n", - si->cmd_line ? (const char *)si->cmd_line : "NULL"); - /* Set up events. */ init_events(); - + /* ENABLE EVENT DELIVERY. This is disabled at start of day. */ __sti(); - arch_print_info(); - setup_xen_features(); /* Init memory management. */ @@ -201,9 +175,6 @@ void stop_kernel(void) /* Reset events. */ fini_events(); - /* Reset traps */ - trap_fini(); - /* Reset arch details */ arch_fini(); } @@ -218,7 +189,7 @@ void stop_kernel(void) void do_exit(void) { printk("Do_exit called!\n"); - stack_walk(); + arch_do_exit(); for( ;; ) { struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_crash }; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:47:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7e-0001No-7D; Sat, 05 Jul 2014 16:47:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7d-0001NX-2l for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:33 +0000 Received: from [85.158.137.68:5055] by server-16.bemta-3.messagelabs.com id EE/00-28986-42C28B35; Sat, 05 Jul 2014 16:47:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1404578850!14254901!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21906 invoked from network); 5 Jul 2014 16:47:31 -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; 5 Jul 2014 16:47:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7Z-0006E1-SN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7Z-0002T4-PT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:29 +0000 Date: Sat, 05 Jul 2014 16:47:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: switched initial C entry point to arch_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 4db67cf657fe0194b56f042c3a89c29bca1e19a9 Author: Karim Raslan AuthorDate: Thu Jun 26 12:28:23 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: switched initial C entry point to arch_init Signed-off-by: Karim Allah Ahmed [talex5@gmail.com: separated from big ARM commit] [talex5@gmail.com: restored comment, moved prototypes to headers] Acked-by: Samuel Thibault [talex5@gmail.com: restored stack address printk on x86] [talex5@gmail.com: moved first printk's after start_info setup on x86] Signed-off-by: Thomas Leonard --- extras/mini-os/arch/x86/setup.c | 44 +++++++++++++++++++++++++++++++------- extras/mini-os/arch/x86/x86_32.S | 2 +- extras/mini-os/arch/x86/x86_64.S | 2 +- extras/mini-os/include/kernel.h | 6 +++- extras/mini-os/include/x86/os.h | 2 - extras/mini-os/kernel.c | 37 +++---------------------------- 6 files changed, 46 insertions(+), 47 deletions(-) diff --git a/extras/mini-os/arch/x86/setup.c b/extras/mini-os/arch/x86/setup.c index 54046d3..5e87dd1 100644 --- a/extras/mini-os/arch/x86/setup.c +++ b/extras/mini-os/arch/x86/setup.c @@ -28,6 +28,8 @@ #include #include /* for printk, memcpy */ +#include +#include /* * Shared page for communicating with the hypervisor. @@ -87,20 +89,45 @@ static inline void sse_init(void) { #define sse_init() #endif + +/* + * INITIAL C ENTRY POINT. + */ void arch_init(start_info_t *si) { + static char hello[] = "Bootstrapping...\n"; + + (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); + + trap_init(); + /*Initialize floating point unit */ - fpu_init(); + fpu_init(); - /* Initialize SSE */ - sse_init(); + /* Initialize SSE */ + sse_init(); /* Copy the start_info struct to a globally-accessible area. */ /* WARN: don't do printk before here, it uses information from shared_info. Use xprintk instead. */ memcpy(&start_info, si, sizeof(*si)); + /* print out some useful information */ + printk("Xen Minimal OS!\n"); + printk(" start_info: %p(VA)\n", si); + printk(" nr_pages: 0x%lx\n", si->nr_pages); + printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info); + printk(" pt_base: %p(VA)\n", (void *)si->pt_base); + printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); + printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); + printk(" mod_start: 0x%lx(VA)\n", si->mod_start); + printk(" mod_len: %lu\n", si->mod_len); + printk(" flags: 0x%x\n", (unsigned int)si->flags); + printk(" cmd_line: %s\n", + si->cmd_line ? (const char *)si->cmd_line : "NULL"); + printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); + /* set up minimal memory infos */ phys_to_machine_mapping = (unsigned long *)start_info.mfn_list; @@ -118,12 +145,15 @@ arch_init(start_info_t *si) (unsigned long)failsafe_callback, 0); #endif - + start_kernel(); } void arch_fini(void) { + /* Reset traps */ + trap_fini(); + #ifdef __i386__ HYPERVISOR_set_callbacks(0, 0, 0, 0); #else @@ -132,9 +162,7 @@ arch_fini(void) } void -arch_print_info(void) +arch_do_exit(void) { - printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); + stack_walk(); } - - diff --git a/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os/arch/x86/x86_32.S index fb3e30a..b9aa392 100644 --- a/extras/mini-os/arch/x86/x86_32.S +++ b/extras/mini-os/arch/x86/x86_32.S @@ -20,7 +20,7 @@ _start: lss stack_start,%esp andl $(~(__STACK_SIZE-1)), %esp push %esi - call start_kernel + call arch_init stack_start: .long stack+(2*__STACK_SIZE), __KERNEL_SS diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index f022eb3..df3469e 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -21,7 +21,7 @@ _start: movq stack_start(%rip),%rsp andq $(~(__STACK_SIZE-1)), %rsp movq %rsi,%rdi - call start_kernel + call arch_init stack_start: .quad stack+(2*__STACK_SIZE) diff --git a/extras/mini-os/include/kernel.h b/extras/mini-os/include/kernel.h index b36f172..13e3274 100644 --- a/extras/mini-os/include/kernel.h +++ b/extras/mini-os/include/kernel.h @@ -1,7 +1,9 @@ #ifndef _KERNEL_H_ #define _KERNEL_H_ -extern void do_exit(void) __attribute__((noreturn)); -extern void stop_kernel(void); +void start_kernel(void); +void do_exit(void) __attribute__((noreturn)); +void arch_do_exit(void); +void stop_kernel(void); #endif /* _KERNEL_H_ */ diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index f193865..73b8297 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -64,8 +64,6 @@ extern shared_info_t *HYPERVISOR_shared_info; void trap_init(void); void trap_fini(void); -void arch_init(start_info_t *si); -void arch_print_info(void); void arch_fini(void); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index c7410db..9a30550 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -28,6 +28,7 @@ */ #include +#include #include #include #include @@ -114,41 +115,14 @@ __attribute__((weak)) int app_main(start_info_t *si) return 0; } -/* - * INITIAL C ENTRY POINT. - */ -void start_kernel(start_info_t *si) +void start_kernel(void) { - static char hello[] = "Bootstrapping...\n"; - - (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); - - arch_init(si); - - trap_init(); - - /* print out some useful information */ - printk("Xen Minimal OS!\n"); - printk(" start_info: %p(VA)\n", si); - printk(" nr_pages: 0x%lx\n", si->nr_pages); - printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info); - printk(" pt_base: %p(VA)\n", (void *)si->pt_base); - printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); - printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); - printk(" mod_start: 0x%lx(VA)\n", si->mod_start); - printk(" mod_len: %lu\n", si->mod_len); - printk(" flags: 0x%x\n", (unsigned int)si->flags); - printk(" cmd_line: %s\n", - si->cmd_line ? (const char *)si->cmd_line : "NULL"); - /* Set up events. */ init_events(); - + /* ENABLE EVENT DELIVERY. This is disabled at start of day. */ __sti(); - arch_print_info(); - setup_xen_features(); /* Init memory management. */ @@ -201,9 +175,6 @@ void stop_kernel(void) /* Reset events. */ fini_events(); - /* Reset traps */ - trap_fini(); - /* Reset arch details */ arch_fini(); } @@ -218,7 +189,7 @@ void stop_kernel(void) void do_exit(void) { printk("Do_exit called!\n"); - stack_walk(); + arch_do_exit(); for( ;; ) { struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_crash }; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:47:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7n-0001PW-AD; Sat, 05 Jul 2014 16:47:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7m-0001PG-Ih for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:42 +0000 Received: from [85.158.143.35:50552] by server-3.bemta-4.messagelabs.com id 4E/8D-16194-D2C28B35; Sat, 05 Jul 2014 16:47:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404578860!15974338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19698 invoked from network); 5 Jul 2014 16:47:41 -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; 5 Jul 2014 16:47:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7k-0006E7-0r for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7j-0002TT-W8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:39 +0000 Date: Sat, 05 Jul 2014 16:47:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: whitespace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2e17503ee4406dbb0511f8b48ece3aba3cc66a1 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:24 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: whitespace Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/gnttab.c | 2 +- extras/mini-os/hypervisor.c | 2 +- extras/mini-os/sched.c | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c index 2f1b3d7..6f25006 100644 --- a/extras/mini-os/gnttab.c +++ b/extras/mini-os/gnttab.c @@ -164,7 +164,7 @@ gnttabop_error(int16_t status) { status = -status; if (status < 0 || status >= ARRAY_SIZE(gnttabop_error_msgs)) - return "bad status"; + return "bad status"; else return gnttabop_error_msgs[status]; } diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index b4688a0..c5de872 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -64,7 +64,7 @@ void do_hypervisor_callback(struct pt_regs *regs) l2 &= ~(1UL << l2i); port = (l1i * (sizeof(unsigned long) * 8)) + l2i; - do_event(port, regs); + do_event(port, regs); } } diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index 174945e..99d87b6 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -165,28 +165,28 @@ struct _reent *__getreent(void) struct _reent *_reent; if (!threads_started) - _reent = _impure_ptr; + _reent = _impure_ptr; else if (in_callback) - _reent = &callback_reent; + _reent = &callback_reent; else - _reent = &get_current()->reent; + _reent = &get_current()->reent; #ifndef NDEBUG #if defined(__x86_64__) || defined(__x86__) { #ifdef __x86_64__ - register unsigned long sp asm ("rsp"); + register unsigned long sp asm ("rsp"); #else - register unsigned long sp asm ("esp"); + register unsigned long sp asm ("esp"); #endif - if ((sp & (STACK_SIZE-1)) < STACK_SIZE / 16) { - static int overflowing; - if (!overflowing) { - overflowing = 1; - printk("stack overflow\n"); - BUG(); - } - } + if ((sp & (STACK_SIZE-1)) < STACK_SIZE / 16) { + static int overflowing; + if (!overflowing) { + overflowing = 1; + printk("stack overflow\n"); + BUG(); + } + } } #endif #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 Sat Jul 05 16:47:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7n-0001PW-AD; Sat, 05 Jul 2014 16:47:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7m-0001PG-Ih for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:42 +0000 Received: from [85.158.143.35:50552] by server-3.bemta-4.messagelabs.com id 4E/8D-16194-D2C28B35; Sat, 05 Jul 2014 16:47:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404578860!15974338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19698 invoked from network); 5 Jul 2014 16:47:41 -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; 5 Jul 2014 16:47:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7k-0006E7-0r for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7j-0002TT-W8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:39 +0000 Date: Sat, 05 Jul 2014 16:47:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: whitespace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2e17503ee4406dbb0511f8b48ece3aba3cc66a1 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:24 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: whitespace Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/gnttab.c | 2 +- extras/mini-os/hypervisor.c | 2 +- extras/mini-os/sched.c | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c index 2f1b3d7..6f25006 100644 --- a/extras/mini-os/gnttab.c +++ b/extras/mini-os/gnttab.c @@ -164,7 +164,7 @@ gnttabop_error(int16_t status) { status = -status; if (status < 0 || status >= ARRAY_SIZE(gnttabop_error_msgs)) - return "bad status"; + return "bad status"; else return gnttabop_error_msgs[status]; } diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index b4688a0..c5de872 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -64,7 +64,7 @@ void do_hypervisor_callback(struct pt_regs *regs) l2 &= ~(1UL << l2i); port = (l1i * (sizeof(unsigned long) * 8)) + l2i; - do_event(port, regs); + do_event(port, regs); } } diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index 174945e..99d87b6 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -165,28 +165,28 @@ struct _reent *__getreent(void) struct _reent *_reent; if (!threads_started) - _reent = _impure_ptr; + _reent = _impure_ptr; else if (in_callback) - _reent = &callback_reent; + _reent = &callback_reent; else - _reent = &get_current()->reent; + _reent = &get_current()->reent; #ifndef NDEBUG #if defined(__x86_64__) || defined(__x86__) { #ifdef __x86_64__ - register unsigned long sp asm ("rsp"); + register unsigned long sp asm ("rsp"); #else - register unsigned long sp asm ("esp"); + register unsigned long sp asm ("esp"); #endif - if ((sp & (STACK_SIZE-1)) < STACK_SIZE / 16) { - static int overflowing; - if (!overflowing) { - overflowing = 1; - printk("stack overflow\n"); - BUG(); - } - } + if ((sp & (STACK_SIZE-1)) < STACK_SIZE / 16) { + static int overflowing; + if (!overflowing) { + overflowing = 1; + printk("stack overflow\n"); + BUG(); + } + } } #endif #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 Sat Jul 05 16:47:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7y-0001Rq-Fo; Sat, 05 Jul 2014 16:47:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7x-0001RX-AB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:53 +0000 Received: from [85.158.137.68:45739] by server-3.bemta-3.messagelabs.com id 02/0B-25808-83C28B35; Sat, 05 Jul 2014 16:47:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404578870!14222762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19646 invoked from network); 5 Jul 2014 16:47:51 -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; 5 Jul 2014 16:47:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7u-0006ED-5m for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7u-0002Tr-4R for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:50 +0000 Date: Sat, 05 Jul 2014 16:47:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added arch_init_gnttab X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d477221d40f0a0b318300bf225655332861cc0c5 Author: Karim Raslan AuthorDate: Thu Jun 26 12:28:25 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: added arch_init_gnttab Moves some x86-specific code into arch/x86. Signed-off-by: Karim Allah Ahmed [talex5@gmail.com: split into multiple patches] Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/mm.c | 13 +++++++++++++ extras/mini-os/gnttab.c | 9 +-------- extras/mini-os/include/gnttab.h | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c index 35df15b..9c6d1b8 100644 --- a/extras/mini-os/arch/x86/mm.c +++ b/extras/mini-os/arch/x86/mm.c @@ -942,3 +942,16 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p) *start_pfn_p = start_pfn; *max_pfn_p = max_pfn; } + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct gnttab_setup_table setup; + unsigned long frames[nr_grant_frames]; + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + return map_frames(frames, nr_grant_frames); +} diff --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c index 6f25006..f395d12 100644 --- a/extras/mini-os/gnttab.c +++ b/extras/mini-os/gnttab.c @@ -172,8 +172,6 @@ gnttabop_error(int16_t status) void init_gnttab(void) { - struct gnttab_setup_table setup; - unsigned long frames[NR_GRANT_FRAMES]; int i; #ifdef GNT_DEBUG @@ -182,12 +180,7 @@ init_gnttab(void) for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++) put_free_entry(i); - setup.dom = DOMID_SELF; - setup.nr_frames = NR_GRANT_FRAMES; - set_xen_guest_handle(setup.frame_list, frames); - - HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); - gnttab_table = map_frames(frames, NR_GRANT_FRAMES); + gnttab_table = arch_init_gnttab(NR_GRANT_FRAMES); printk("gnttab_table mapped at %p.\n", gnttab_table); } diff --git a/extras/mini-os/include/gnttab.h b/extras/mini-os/include/gnttab.h index acd6c39..c43ad42 100644 --- a/extras/mini-os/include/gnttab.h +++ b/extras/mini-os/include/gnttab.h @@ -12,5 +12,6 @@ unsigned long gnttab_end_transfer(grant_ref_t gref); int gnttab_end_access(grant_ref_t ref); const char *gnttabop_error(int16_t status); void fini_gnttab(void); +grant_entry_t *arch_init_gnttab(int nr_grant_frames); #endif /* !__GNTTAB_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 Jul 05 16:47:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:47: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 1X3T7y-0001Rq-Fo; Sat, 05 Jul 2014 16:47:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7x-0001RX-AB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:53 +0000 Received: from [85.158.137.68:45739] by server-3.bemta-3.messagelabs.com id 02/0B-25808-83C28B35; Sat, 05 Jul 2014 16:47:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404578870!14222762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19646 invoked from network); 5 Jul 2014 16:47:51 -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; 5 Jul 2014 16:47:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T7u-0006ED-5m for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T7u-0002Tr-4R for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:47:50 +0000 Date: Sat, 05 Jul 2014 16:47:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added arch_init_gnttab X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d477221d40f0a0b318300bf225655332861cc0c5 Author: Karim Raslan AuthorDate: Thu Jun 26 12:28:25 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:34 2014 +0100 mini-os: added arch_init_gnttab Moves some x86-specific code into arch/x86. Signed-off-by: Karim Allah Ahmed [talex5@gmail.com: split into multiple patches] Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/mm.c | 13 +++++++++++++ extras/mini-os/gnttab.c | 9 +-------- extras/mini-os/include/gnttab.h | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c index 35df15b..9c6d1b8 100644 --- a/extras/mini-os/arch/x86/mm.c +++ b/extras/mini-os/arch/x86/mm.c @@ -942,3 +942,16 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p) *start_pfn_p = start_pfn; *max_pfn_p = max_pfn; } + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct gnttab_setup_table setup; + unsigned long frames[nr_grant_frames]; + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + return map_frames(frames, nr_grant_frames); +} diff --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c index 6f25006..f395d12 100644 --- a/extras/mini-os/gnttab.c +++ b/extras/mini-os/gnttab.c @@ -172,8 +172,6 @@ gnttabop_error(int16_t status) void init_gnttab(void) { - struct gnttab_setup_table setup; - unsigned long frames[NR_GRANT_FRAMES]; int i; #ifdef GNT_DEBUG @@ -182,12 +180,7 @@ init_gnttab(void) for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++) put_free_entry(i); - setup.dom = DOMID_SELF; - setup.nr_frames = NR_GRANT_FRAMES; - set_xen_guest_handle(setup.frame_list, frames); - - HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); - gnttab_table = map_frames(frames, NR_GRANT_FRAMES); + gnttab_table = arch_init_gnttab(NR_GRANT_FRAMES); printk("gnttab_table mapped at %p.\n", gnttab_table); } diff --git a/extras/mini-os/include/gnttab.h b/extras/mini-os/include/gnttab.h index acd6c39..c43ad42 100644 --- a/extras/mini-os/include/gnttab.h +++ b/extras/mini-os/include/gnttab.h @@ -12,5 +12,6 @@ unsigned long gnttab_end_transfer(grant_ref_t gref); int gnttab_end_access(grant_ref_t ref); const char *gnttabop_error(int16_t status); void fini_gnttab(void); +grant_entry_t *arch_init_gnttab(int nr_grant_frames); #endif /* !__GNTTAB_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 Jul 05 16:48:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T88-0001Tp-Ig; Sat, 05 Jul 2014 16:48:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T87-0001TQ-3u for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:03 +0000 Received: from [85.158.143.35:45760] by server-1.bemta-4.messagelabs.com id 93/B6-09496-24C28B35; Sat, 05 Jul 2014 16:48:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1404578880!8748679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11529 invoked from network); 5 Jul 2014 16:48:01 -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; 5 Jul 2014 16:48:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T84-0006EM-BP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T84-0002UE-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:00 +0000 Date: Sat, 05 Jul 2014 16:48:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: don't require XEN_HAVE_PV_UPCALL_MASK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cae37fc8ba1e1caa277fd25ad18153fadb40e81 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:26 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:35 2014 +0100 mini-os: don't require XEN_HAVE_PV_UPCALL_MASK This isn't available on ARM. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/hypervisor.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index c5de872..1b61d9b 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -73,18 +73,26 @@ void do_hypervisor_callback(struct pt_regs *regs) void force_evtchn_callback(void) { +#ifdef XEN_HAVE_PV_UPCALL_MASK int save; +#endif vcpu_info_t *vcpu; vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; +#ifdef XEN_HAVE_PV_UPCALL_MASK save = vcpu->evtchn_upcall_mask; +#endif while (vcpu->evtchn_upcall_pending) { +#ifdef XEN_HAVE_PV_UPCALL_MASK vcpu->evtchn_upcall_mask = 1; +#endif barrier(); do_hypervisor_callback(NULL); barrier(); +#ifdef XEN_HAVE_PV_UPCALL_MASK vcpu->evtchn_upcall_mask = save; barrier(); +#endif }; } @@ -110,7 +118,9 @@ inline void unmask_evtchn(uint32_t port) &vcpu_info->evtchn_pending_sel) ) { vcpu_info->evtchn_upcall_pending = 1; +#ifdef XEN_HAVE_PV_UPCALL_MASK if ( !vcpu_info->evtchn_upcall_mask ) +#endif force_evtchn_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 Sat Jul 05 16:48:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T88-0001Tp-Ig; Sat, 05 Jul 2014 16:48:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T87-0001TQ-3u for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:03 +0000 Received: from [85.158.143.35:45760] by server-1.bemta-4.messagelabs.com id 93/B6-09496-24C28B35; Sat, 05 Jul 2014 16:48:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1404578880!8748679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11529 invoked from network); 5 Jul 2014 16:48:01 -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; 5 Jul 2014 16:48:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T84-0006EM-BP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T84-0002UE-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:00 +0000 Date: Sat, 05 Jul 2014 16:48:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: don't require XEN_HAVE_PV_UPCALL_MASK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cae37fc8ba1e1caa277fd25ad18153fadb40e81 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:26 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:35 2014 +0100 mini-os: don't require XEN_HAVE_PV_UPCALL_MASK This isn't available on ARM. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/hypervisor.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index c5de872..1b61d9b 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -73,18 +73,26 @@ void do_hypervisor_callback(struct pt_regs *regs) void force_evtchn_callback(void) { +#ifdef XEN_HAVE_PV_UPCALL_MASK int save; +#endif vcpu_info_t *vcpu; vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; +#ifdef XEN_HAVE_PV_UPCALL_MASK save = vcpu->evtchn_upcall_mask; +#endif while (vcpu->evtchn_upcall_pending) { +#ifdef XEN_HAVE_PV_UPCALL_MASK vcpu->evtchn_upcall_mask = 1; +#endif barrier(); do_hypervisor_callback(NULL); barrier(); +#ifdef XEN_HAVE_PV_UPCALL_MASK vcpu->evtchn_upcall_mask = save; barrier(); +#endif }; } @@ -110,7 +118,9 @@ inline void unmask_evtchn(uint32_t port) &vcpu_info->evtchn_pending_sel) ) { vcpu_info->evtchn_upcall_pending = 1; +#ifdef XEN_HAVE_PV_UPCALL_MASK if ( !vcpu_info->evtchn_upcall_mask ) +#endif force_evtchn_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 Sat Jul 05 16:48:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8I-0001Vc-NS; Sat, 05 Jul 2014 16:48:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8H-0001VE-5Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:13 +0000 Received: from [85.158.137.68:46230] by server-9.bemta-3.messagelabs.com id 04/BC-09496-C4C28B35; Sat, 05 Jul 2014 16:48:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404578890!9772986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24663 invoked from network); 5 Jul 2014 16:48:11 -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; 5 Jul 2014 16:48:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8E-0006Ev-GU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8E-0002VH-Eu for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:10 +0000 Date: Sat, 05 Jul 2014 16:48:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: add missing casts to MM printk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49a37237c78816937595082775e505bb8b18ea39 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:27 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:35 2014 +0100 mini-os: add missing casts to MM printk The code previously assumed that a long was 64-bits. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/mm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/mm.c b/extras/mini-os/mm.c index d2d5264..64b3292 100644 --- a/extras/mini-os/mm.c +++ b/extras/mini-os/mm.c @@ -409,8 +409,8 @@ void init_mm(void) * now we can initialise the page allocator */ printk("MM: Initialise page allocator for %lx(%lx)-%lx(%lx)\n", - (u_long)to_virt(PFN_PHYS(start_pfn)), PFN_PHYS(start_pfn), - (u_long)to_virt(PFN_PHYS(max_pfn)), PFN_PHYS(max_pfn)); + (u_long)to_virt(PFN_PHYS(start_pfn)), (u_long)PFN_PHYS(start_pfn), + (u_long)to_virt(PFN_PHYS(max_pfn)), (u_long)PFN_PHYS(max_pfn)); init_page_allocator(PFN_PHYS(start_pfn), PFN_PHYS(max_pfn)); printk("MM: done\n"); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8I-0001Vc-NS; Sat, 05 Jul 2014 16:48:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8H-0001VE-5Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:13 +0000 Received: from [85.158.137.68:46230] by server-9.bemta-3.messagelabs.com id 04/BC-09496-C4C28B35; Sat, 05 Jul 2014 16:48:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404578890!9772986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24663 invoked from network); 5 Jul 2014 16:48:11 -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; 5 Jul 2014 16:48:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8E-0006Ev-GU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8E-0002VH-Eu for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:10 +0000 Date: Sat, 05 Jul 2014 16:48:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: add missing casts to MM printk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49a37237c78816937595082775e505bb8b18ea39 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:27 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 13:38:35 2014 +0100 mini-os: add missing casts to MM printk The code previously assumed that a long was 64-bits. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/mm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/mm.c b/extras/mini-os/mm.c index d2d5264..64b3292 100644 --- a/extras/mini-os/mm.c +++ b/extras/mini-os/mm.c @@ -409,8 +409,8 @@ void init_mm(void) * now we can initialise the page allocator */ printk("MM: Initialise page allocator for %lx(%lx)-%lx(%lx)\n", - (u_long)to_virt(PFN_PHYS(start_pfn)), PFN_PHYS(start_pfn), - (u_long)to_virt(PFN_PHYS(max_pfn)), PFN_PHYS(max_pfn)); + (u_long)to_virt(PFN_PHYS(start_pfn)), (u_long)PFN_PHYS(start_pfn), + (u_long)to_virt(PFN_PHYS(max_pfn)), (u_long)PFN_PHYS(max_pfn)); init_page_allocator(PFN_PHYS(start_pfn), PFN_PHYS(max_pfn)); printk("MM: done\n"); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8S-0001Xf-Qi; Sat, 05 Jul 2014 16:48:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8R-0001XE-2i for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:23 +0000 Received: from [85.158.143.35:55925] by server-2.bemta-4.messagelabs.com id 0A/5A-18579-65C28B35; Sat, 05 Jul 2014 16:48:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1404578900!16097748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28481 invoked from network); 5 Jul 2014 16:48:21 -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; 5 Jul 2014 16:48:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8O-0006F1-NK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8O-0002Vf-Jw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:20 +0000 Date: Sat, 05 Jul 2014 16:48:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added arch_unbind_ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b757e8d41f7d61fff9560428e11a587796ebbc34 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:29 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: added arch_unbind_ports This allows closing any ports opened by the arch-specific code. ARM will use it for the debug port. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/events.c | 4 ++++ extras/mini-os/events.c | 1 + extras/mini-os/include/events.h | 4 ++++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/x86/events.c b/extras/mini-os/arch/x86/events.c index e420a98..5198cf3 100644 --- a/extras/mini-os/arch/x86/events.c +++ b/extras/mini-os/arch/x86/events.c @@ -23,6 +23,10 @@ void arch_init_events(void) #endif } +void arch_unbind_ports(void) +{ +} + void arch_fini_events(void) { #if defined(__x86_64__) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 3c92d82..48742de 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -179,6 +179,7 @@ void init_events(void) void fini_events(void) { /* Dealloc all events */ + arch_unbind_ports(); unbind_all_ports(); arch_fini_events(); } diff --git a/extras/mini-os/include/events.h b/extras/mini-os/include/events.h index 0452d21..89b5997 100644 --- a/extras/mini-os/include/events.h +++ b/extras/mini-os/include/events.h @@ -26,6 +26,10 @@ typedef void (*evtchn_handler_t)(evtchn_port_t, struct pt_regs *, void *); /* prototypes */ void arch_init_events(void); + +/* Called by fini_events to close any ports opened by arch-specific code. */ +void arch_unbind_ports(void); + void arch_fini_events(void); int do_event(evtchn_port_t port, struct pt_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8S-0001Xf-Qi; Sat, 05 Jul 2014 16:48:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8R-0001XE-2i for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:23 +0000 Received: from [85.158.143.35:55925] by server-2.bemta-4.messagelabs.com id 0A/5A-18579-65C28B35; Sat, 05 Jul 2014 16:48:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1404578900!16097748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28481 invoked from network); 5 Jul 2014 16:48:21 -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; 5 Jul 2014 16:48:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8O-0006F1-NK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8O-0002Vf-Jw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:20 +0000 Date: Sat, 05 Jul 2014 16:48:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added arch_unbind_ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b757e8d41f7d61fff9560428e11a587796ebbc34 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:29 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: added arch_unbind_ports This allows closing any ports opened by the arch-specific code. ARM will use it for the debug port. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/events.c | 4 ++++ extras/mini-os/events.c | 1 + extras/mini-os/include/events.h | 4 ++++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/x86/events.c b/extras/mini-os/arch/x86/events.c index e420a98..5198cf3 100644 --- a/extras/mini-os/arch/x86/events.c +++ b/extras/mini-os/arch/x86/events.c @@ -23,6 +23,10 @@ void arch_init_events(void) #endif } +void arch_unbind_ports(void) +{ +} + void arch_fini_events(void) { #if defined(__x86_64__) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 3c92d82..48742de 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -179,6 +179,7 @@ void init_events(void) void fini_events(void) { /* Dealloc all events */ + arch_unbind_ports(); unbind_all_ports(); arch_fini_events(); } diff --git a/extras/mini-os/include/events.h b/extras/mini-os/include/events.h index 0452d21..89b5997 100644 --- a/extras/mini-os/include/events.h +++ b/extras/mini-os/include/events.h @@ -26,6 +26,10 @@ typedef void (*evtchn_handler_t)(evtchn_port_t, struct pt_regs *, void *); /* prototypes */ void arch_init_events(void); + +/* Called by fini_events to close any ports opened by arch-specific code. */ +void arch_unbind_ports(void); + void arch_fini_events(void); int do_event(evtchn_port_t port, struct pt_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8c-0001ZO-TT; Sat, 05 Jul 2014 16:48:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8b-0001Z8-EW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:33 +0000 Received: from [193.109.254.147:14619] by server-13.bemta-14.messagelabs.com id EC/C9-14699-06C28B35; Sat, 05 Jul 2014 16:48:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1404578911!15675583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7349 invoked from network); 5 Jul 2014 16:48:31 -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; 5 Jul 2014 16:48:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8Y-0006F9-Rr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8Y-0002W2-Qr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:30 +0000 Date: Sat, 05 Jul 2014 16:48:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: moved __pte to 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 6390247d9c065effe1ca3c121d10062037acc91f Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:30 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: moved __pte to x86 We don't need to define this on ARM. Suggested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/include/types.h | 12 ------------ .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 5 +++++ .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 4 ++++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index de356e8..93356fe 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -30,23 +30,11 @@ typedef unsigned long u_long; #ifdef __i386__ typedef long long quad_t; typedef unsigned long long u_quad_t; - -typedef struct { unsigned long pte_low, pte_high; } pte_t; - #elif defined(__x86_64__) typedef long quad_t; typedef unsigned long u_quad_t; - -typedef struct { unsigned long pte; } pte_t; #endif /* __i386__ || __x86_64__ */ -#ifdef __x86_64__ -#define __pte(x) ((pte_t) { (x) } ) -#else -#define __pte(x) ({ unsigned long long _x = (x); \ - ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); }) -#endif - #ifdef HAVE_LIBC #include #include diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h index dcfbe41..99a4ee3 100644 --- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h +++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h @@ -35,6 +35,11 @@ #include #include +typedef struct { unsigned long pte_low, pte_high; } pte_t; + +#define __pte(x) ({ unsigned long long _x = (x); \ + ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); }) + #define __STR(x) #x #define STR(x) __STR(x) diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h index 7083763..e00b3bd 100644 --- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h +++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h @@ -38,6 +38,10 @@ #include #include +typedef struct { unsigned long pte; } pte_t; + +#define __pte(x) ((pte_t) { (x) } ) + #define __STR(x) #x #define STR(x) __STR(x) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8c-0001ZO-TT; Sat, 05 Jul 2014 16:48:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8b-0001Z8-EW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:33 +0000 Received: from [193.109.254.147:14619] by server-13.bemta-14.messagelabs.com id EC/C9-14699-06C28B35; Sat, 05 Jul 2014 16:48:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1404578911!15675583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7349 invoked from network); 5 Jul 2014 16:48:31 -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; 5 Jul 2014 16:48:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8Y-0006F9-Rr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8Y-0002W2-Qr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:30 +0000 Date: Sat, 05 Jul 2014 16:48:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: moved __pte to 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 6390247d9c065effe1ca3c121d10062037acc91f Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:30 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: moved __pte to x86 We don't need to define this on ARM. Suggested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/include/types.h | 12 ------------ .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 5 +++++ .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 4 ++++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index de356e8..93356fe 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -30,23 +30,11 @@ typedef unsigned long u_long; #ifdef __i386__ typedef long long quad_t; typedef unsigned long long u_quad_t; - -typedef struct { unsigned long pte_low, pte_high; } pte_t; - #elif defined(__x86_64__) typedef long quad_t; typedef unsigned long u_quad_t; - -typedef struct { unsigned long pte; } pte_t; #endif /* __i386__ || __x86_64__ */ -#ifdef __x86_64__ -#define __pte(x) ((pte_t) { (x) } ) -#else -#define __pte(x) ({ unsigned long long _x = (x); \ - ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); }) -#endif - #ifdef HAVE_LIBC #include #include diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h index dcfbe41..99a4ee3 100644 --- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h +++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h @@ -35,6 +35,11 @@ #include #include +typedef struct { unsigned long pte_low, pte_high; } pte_t; + +#define __pte(x) ({ unsigned long long _x = (x); \ + ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); }) + #define __STR(x) #x #define STR(x) __STR(x) diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h index 7083763..e00b3bd 100644 --- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h +++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h @@ -38,6 +38,10 @@ #include #include +typedef struct { unsigned long pte; } pte_t; + +#define __pte(x) ((pte_t) { (x) } ) + #define __STR(x) #x #define STR(x) __STR(x) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:48:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8n-0001as-08; Sat, 05 Jul 2014 16:48:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8l-0001aZ-RA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:43 +0000 Received: from [85.158.137.68:6832] by server-8.bemta-3.messagelabs.com id 1C/84-07166-B6C28B35; Sat, 05 Jul 2014 16:48:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1404578921!14139728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29695 invoked from network); 5 Jul 2014 16:48:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:48:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8j-0006FF-08 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8i-0002WT-VG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:40 +0000 Date: Sat, 05 Jul 2014 16:48:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: moved unlikely/likely macros to new compiler.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 3973f7f3314f83109f973d5d92841911d7839c31 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:31 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: moved unlikely/likely macros to new compiler.h Requested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/include/compiler.h | 5 +++++ extras/mini-os/include/x86/os.h | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os/include/compiler.h new file mode 100644 index 0000000..e35c9d5 --- /dev/null +++ b/extras/mini-os/include/compiler.h @@ -0,0 +1,5 @@ +#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#define __builtin_expect(x, expected_value) (x) +#endif +#define unlikely(x) __builtin_expect((x),0) +#define likely(x) __builtin_expect((x),1) diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 73b8297..192b23cd 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -7,16 +7,11 @@ #ifndef _OS_H_ #define _OS_H_ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -#define __builtin_expect(x, expected_value) (x) -#endif -#define unlikely(x) __builtin_expect((x),0) -#define likely(x) __builtin_expect((x),1) - #define smp_processor_id() 0 #ifndef __ASSEMBLY__ +#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 Jul 05 16:48:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8n-0001as-08; Sat, 05 Jul 2014 16:48:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8l-0001aZ-RA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:43 +0000 Received: from [85.158.137.68:6832] by server-8.bemta-3.messagelabs.com id 1C/84-07166-B6C28B35; Sat, 05 Jul 2014 16:48:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1404578921!14139728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29695 invoked from network); 5 Jul 2014 16:48:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:48:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8j-0006FF-08 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8i-0002WT-VG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:40 +0000 Date: Sat, 05 Jul 2014 16:48:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: moved unlikely/likely macros to new compiler.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 3973f7f3314f83109f973d5d92841911d7839c31 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:31 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:20 2014 +0100 mini-os: moved unlikely/likely macros to new compiler.h Requested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/include/compiler.h | 5 +++++ extras/mini-os/include/x86/os.h | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os/include/compiler.h new file mode 100644 index 0000000..e35c9d5 --- /dev/null +++ b/extras/mini-os/include/compiler.h @@ -0,0 +1,5 @@ +#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#define __builtin_expect(x, expected_value) (x) +#endif +#define unlikely(x) __builtin_expect((x),0) +#define likely(x) __builtin_expect((x),1) diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 73b8297..192b23cd 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -7,16 +7,11 @@ #ifndef _OS_H_ #define _OS_H_ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -#define __builtin_expect(x, expected_value) (x) -#endif -#define unlikely(x) __builtin_expect((x),0) -#define likely(x) __builtin_expect((x),1) - #define smp_processor_id() 0 #ifndef __ASSEMBLY__ +#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 Jul 05 16:48:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8x-0001ha-4S; Sat, 05 Jul 2014 16:48:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8v-0001ge-Ph for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:53 +0000 Received: from [85.158.143.35:56890] by server-1.bemta-4.messagelabs.com id 34/E6-09496-57C28B35; Sat, 05 Jul 2014 16:48:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1404578931!16015842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3785 invoked from network); 5 Jul 2014 16:48:52 -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; 5 Jul 2014 16:48:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8t-0006FL-4y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8t-0002Y3-3w for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:51 +0000 Date: Sat, 05 Jul 2014 16:48:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: enable test_xenbus again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9684bc8c3659bd804298c7372dacda238c6f297c Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:32 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 mini-os: enable test_xenbus again The old code said "Xenbus tests disabled, because of a Xend bug". Since xend doesn't exist any longer, we can enable these again. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/test.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/test.c b/extras/mini-os/test.c index bbfc613..20d372b 100644 --- a/extras/mini-os/test.c +++ b/extras/mini-os/test.c @@ -56,8 +56,7 @@ void test_xenbus(void); static void xenbus_tester(void *p) { - printk("Xenbus tests disabled, because of a Xend bug.\n"); - /* test_xenbus(); */ + test_xenbus(); } #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 Jul 05 16:48:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:48: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 1X3T8x-0001ha-4S; Sat, 05 Jul 2014 16:48:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8v-0001ge-Ph for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:53 +0000 Received: from [85.158.143.35:56890] by server-1.bemta-4.messagelabs.com id 34/E6-09496-57C28B35; Sat, 05 Jul 2014 16:48:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1404578931!16015842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3785 invoked from network); 5 Jul 2014 16:48:52 -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; 5 Jul 2014 16:48:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T8t-0006FL-4y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T8t-0002Y3-3w for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:48:51 +0000 Date: Sat, 05 Jul 2014 16:48:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: enable test_xenbus again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9684bc8c3659bd804298c7372dacda238c6f297c Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:32 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 mini-os: enable test_xenbus again The old code said "Xenbus tests disabled, because of a Xend bug". Since xend doesn't exist any longer, we can enable these again. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/test.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/test.c b/extras/mini-os/test.c index bbfc613..20d372b 100644 --- a/extras/mini-os/test.c +++ b/extras/mini-os/test.c @@ -56,8 +56,7 @@ void test_xenbus(void); static void xenbus_tester(void *p) { - printk("Xenbus tests disabled, because of a Xend bug.\n"); - /* test_xenbus(); */ + test_xenbus(); } #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 Jul 05 16:49:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T98-0001k9-7O; Sat, 05 Jul 2014 16:49:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T95-0001js-HQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:05 +0000 Received: from [85.158.143.35:47843] by server-3.bemta-4.messagelabs.com id BA/DD-16194-E7C28B35; Sat, 05 Jul 2014 16:49:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404578941!16026724!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30769 invoked from network); 5 Jul 2014 16:49:02 -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; 5 Jul 2014 16:49:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T93-0006Fx-A2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T93-0002YQ-8y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:01 +0000 Date: Sat, 05 Jul 2014 16:49:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use irqs_disabled() helper in schedule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18b2061a136ce4fa72772f065cf9089057673b56 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:33 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 mini-os: use irqs_disabled() helper in schedule Testing whether the result of local_irq_save is zero doesn't work on ARM. Suggested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/sched.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index 99d87b6..d0c607e 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -78,6 +78,11 @@ void schedule(void) struct thread *prev, *next, *thread, *tmp; unsigned long flags; + if (irqs_disabled()) { + printk("Must not call schedule() with IRQs disabled\n"); + BUG(); + } + prev = current; local_irq_save(flags); @@ -86,11 +91,6 @@ void schedule(void) BUG(); } - if (flags) { - printk("Must not call schedule() with IRQs disabled\n"); - BUG(); - } - do { /* Examine all threads. Find a runnable thread, but also wake up expired ones and find the -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:49:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T98-0001k9-7O; Sat, 05 Jul 2014 16:49:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T95-0001js-HQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:05 +0000 Received: from [85.158.143.35:47843] by server-3.bemta-4.messagelabs.com id BA/DD-16194-E7C28B35; Sat, 05 Jul 2014 16:49:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404578941!16026724!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30769 invoked from network); 5 Jul 2014 16:49:02 -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; 5 Jul 2014 16:49:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T93-0006Fx-A2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T93-0002YQ-8y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:01 +0000 Date: Sat, 05 Jul 2014 16:49:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use irqs_disabled() helper in schedule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18b2061a136ce4fa72772f065cf9089057673b56 Author: Thomas Leonard AuthorDate: Thu Jun 26 12:28:33 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 mini-os: use irqs_disabled() helper in schedule Testing whether the result of local_irq_save is zero doesn't work on ARM. Suggested by Julien Grall. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/sched.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index 99d87b6..d0c607e 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -78,6 +78,11 @@ void schedule(void) struct thread *prev, *next, *thread, *tmp; unsigned long flags; + if (irqs_disabled()) { + printk("Must not call schedule() with IRQs disabled\n"); + BUG(); + } + prev = current; local_irq_save(flags); @@ -86,11 +91,6 @@ void schedule(void) BUG(); } - if (flags) { - printk("Must not call schedule() with IRQs disabled\n"); - BUG(); - } - do { /* Examine all threads. Find a runnable thread, but also wake up expired ones and find the -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:49:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9I-0001mS-Cc; Sat, 05 Jul 2014 16:49:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9H-0001mA-4w for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:15 +0000 Received: from [85.158.139.211:54114] by server-9.bemta-5.messagelabs.com id 7C/6C-14363-A8C28B35; Sat, 05 Jul 2014 16:49:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404578951!8449603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15480 invoked from network); 5 Jul 2014 16:49:12 -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; 5 Jul 2014 16:49:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9D-0006G3-Ht for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9D-0002Zk-FY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:11 +0000 Date: Sat, 05 Jul 2014 16:49:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add xc_hvm_param_get/set() to get/set 64-bit values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a9daad3802a4c4bb64076369ee43a90b390b351 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:50 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 libxc: add xc_hvm_param_get/set() to get/set 64-bit values HVMOP_get_param and HVMOP_set_param take a uint32_t for the parameter index and a uint64_t for the value. So add xc_hvm_param_get() and xc_hvm_param_set() that take the same types. The existing xc_get_hvm_param() and xc_set_hvm_param() are retained for compatibility but are deprecated. Signed-off-by: David Vrabel Acked-by: Ian Campbell [ ijc -- dropped one hunk against xen-access.c which didn't apply due to intervening changes ] --- tools/libxc/xc_cpuid_x86.c | 11 ++++----- tools/libxc/xc_dom_arm.c | 8 +++--- tools/libxc/xc_domain.c | 21 +++++++++++++++++- tools/libxc/xc_domain_restore.c | 30 +++++++++++++------------- tools/libxc/xc_domain_save.c | 39 +++++++++++----------------------- tools/libxc/xc_hvm_build_x86.c | 20 +++++++++--------- tools/libxc/xc_resume.c | 4 +- tools/libxc/xenctrl.h | 3 ++ tools/libxl/libxl.c | 6 ++-- tools/libxl/libxl_dom.c | 30 +++++++++++++++----------- tools/python/xen/lowlevel/xc/xc.c | 16 +++++++------- tools/tests/xen-access/xen-access.c | 6 ++-- 12 files changed, 102 insertions(+), 92 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 4772ca7..8acb9fb 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -276,13 +276,12 @@ static void xc_cpuid_hvm_policy( { DECLARE_DOMCTL; char brand[13]; - unsigned long nestedhvm; - unsigned long pae; + uint64_t val; int is_pae, is_nestedhvm; uint64_t xfeature_mask; - xc_get_hvm_param(xch, domid, HVM_PARAM_PAE_ENABLED, &pae); - is_pae = !!pae; + xc_hvm_param_get(xch, domid, HVM_PARAM_PAE_ENABLED, &val); + is_pae = !!val; /* Detecting Xen's atitude towards XSAVE */ memset(&domctl, 0, sizeof(domctl)); @@ -291,8 +290,8 @@ static void xc_cpuid_hvm_policy( do_domctl(xch, &domctl); xfeature_mask = domctl.u.vcpuextstate.xfeature_mask; - xc_get_hvm_param(xch, domid, HVM_PARAM_NESTEDHVM, &nestedhvm); - is_nestedhvm = !!nestedhvm; + xc_hvm_param_get(xch, domid, HVM_PARAM_NESTEDHVM, &val); + is_nestedhvm = !!val; switch ( input[0] ) { diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index cc64363..10f6bcb 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -80,14 +80,14 @@ static int alloc_magic_pages(struct xc_dom_image *dom) xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, dom->console_pfn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, dom->xenstore_pfn); /* allocated by toolstack */ - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_EVTCHN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_EVTCHN, dom->console_evtchn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_EVTCHN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_EVTCHN, dom->xenstore_evtchn); return 0; diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 65d9a08..0230c6c 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1264,7 +1264,7 @@ int xc_domain_send_trigger(xc_interface *xch, return do_domctl(xch, &domctl); } -int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value) +int xc_hvm_param_set(xc_interface *handle, domid_t dom, uint32_t param, uint64_t value) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BUFFER(xen_hvm_param_t, arg); @@ -1285,7 +1285,7 @@ int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long return rc; } -int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value) +int xc_hvm_param_get(xc_interface *handle, domid_t dom, uint32_t param, uint64_t *value) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BUFFER(xen_hvm_param_t, arg); @@ -1306,6 +1306,23 @@ int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long return rc; } +int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value) +{ + return xc_hvm_param_set(handle, dom, param, value); +} + +int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value) +{ + uint64_t v; + int ret; + + ret = xc_hvm_param_get(handle, dom, param, &v); + if (ret < 0) + return ret; + *value = v; + return 0; +} + int xc_hvm_create_ioreq_server(xc_interface *xch, domid_t domid, int handle_bufioreq, diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b80f867..08d24fa 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1646,15 +1646,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } /* should this be deferred? does it change? */ if ( pagebuf.identpt ) - xc_set_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, pagebuf.identpt); + xc_hvm_param_set(xch, dom, HVM_PARAM_IDENT_PT, pagebuf.identpt); if ( pagebuf.paging_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, pagebuf.paging_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_PAGING_RING_PFN, pagebuf.paging_ring_pfn); if ( pagebuf.access_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, pagebuf.access_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_ACCESS_RING_PFN, pagebuf.access_ring_pfn); if ( pagebuf.sharing_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, pagebuf.sharing_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_SHARING_RING_PFN, pagebuf.sharing_ring_pfn); if ( pagebuf.vm86_tss ) - xc_set_hvm_param(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); + xc_hvm_param_set(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); if ( pagebuf.console_pfn ) console_pfn = pagebuf.console_pfn; if ( pagebuf.vm_generationid_addr ) { @@ -1769,7 +1769,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } if (pagebuf.viridian != 0) - xc_set_hvm_param(xch, dom, HVM_PARAM_VIRIDIAN, 1); + xc_hvm_param_set(xch, dom, HVM_PARAM_VIRIDIAN, 1); /* * If we are migrating in from a host that does not support @@ -1789,16 +1789,16 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } else { if (pagebuf.nr_ioreq_server_pages != 0 && pagebuf.ioreq_server_pfn != 0) { - xc_set_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + xc_hvm_param_set(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, pagebuf.nr_ioreq_server_pages); - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, pagebuf.ioreq_server_pfn); } } if (pagebuf.acpi_ioport_location == 1) { DBGPRINTF("Use new firmware ioport from the checkpoint\n"); - xc_set_hvm_param(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); + xc_hvm_param_set(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); } else if (pagebuf.acpi_ioport_location == 0) { DBGPRINTF("Use old firmware ioport from the checkpoint\n"); } else { @@ -2329,15 +2329,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - if ( (frc = xc_set_hvm_param(xch, dom, + if ( (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_PFN, tailbuf.u.hvm.magicpfns[0])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_BUFIOREQ_PFN, tailbuf.u.hvm.magicpfns[1])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, tailbuf.u.hvm.magicpfns[2])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_PAE_ENABLED, pae)) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_EVTCHN, store_evtchn)) ) { @@ -2351,7 +2351,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, PERROR("error zeroing console page"); goto out; } - if ( (frc = xc_set_hvm_param(xch, dom, + if ( (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_CONSOLE_PFN, console_pfn)) ) { PERROR("error setting HVM param: %i", frc); goto out; diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 778cbde..14502c1 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1645,8 +1645,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_IDENT_PT; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_IDENT_PT, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1657,8 +1656,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_PAGING_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_PAGING_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1669,8 +1667,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_ACCESS_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_ACCESS_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1681,8 +1678,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_SHARING_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_SHARING_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1693,8 +1689,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_VM86_TSS; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_VM86_TSS, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_VM86_TSS, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1705,8 +1700,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_CONSOLE_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_CONSOLE_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_CONSOLE_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1717,8 +1711,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_ACPI_IOPORTS_LOCATION; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, &chunk.data); if ((chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk))) { @@ -1728,8 +1721,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_VIRIDIAN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_VIRIDIAN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_VIRIDIAN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1740,8 +1732,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_IOREQ_SERVER_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1752,8 +1743,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_NR_IOREQ_SERVER_PAGES; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1827,12 +1817,9 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* Save magic-page locations. */ memset(magic_pfns, 0, sizeof(magic_pfns)); - xc_get_hvm_param(xch, dom, HVM_PARAM_IOREQ_PFN, - (unsigned long *)&magic_pfns[0]); - xc_get_hvm_param(xch, dom, HVM_PARAM_BUFIOREQ_PFN, - (unsigned long *)&magic_pfns[1]); - xc_get_hvm_param(xch, dom, HVM_PARAM_STORE_PFN, - (unsigned long *)&magic_pfns[2]); + xc_hvm_param_get(xch, dom, HVM_PARAM_IOREQ_PFN, &magic_pfns[0]); + xc_hvm_param_get(xch, dom, HVM_PARAM_BUFIOREQ_PFN, &magic_pfns[1]); + xc_hvm_param_get(xch, dom, HVM_PARAM_STORE_PFN, &magic_pfns[2]); if ( wrexact(io_fd, magic_pfns, sizeof(magic_pfns)) ) { PERROR("Error when writing to state file (7)"); diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index ed1069b..c81a25b 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -487,19 +487,19 @@ static int setup_guest(xc_interface *xch, if ( xc_clear_domain_pages(xch, dom, special_pfn(0), NR_SPECIAL_PAGES) ) goto error_out; - xc_set_hvm_param(xch, dom, HVM_PARAM_STORE_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, special_pfn(SPECIALPAGE_XENSTORE)); - xc_set_hvm_param(xch, dom, HVM_PARAM_BUFIOREQ_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_BUFIOREQ_PFN, special_pfn(SPECIALPAGE_BUFIOREQ)); - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_PFN, special_pfn(SPECIALPAGE_IOREQ)); - xc_set_hvm_param(xch, dom, HVM_PARAM_CONSOLE_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_CONSOLE_PFN, special_pfn(SPECIALPAGE_CONSOLE)); - xc_set_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_PAGING_RING_PFN, special_pfn(SPECIALPAGE_PAGING)); - xc_set_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_ACCESS_RING_PFN, special_pfn(SPECIALPAGE_ACCESS)); - xc_set_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); /* @@ -521,9 +521,9 @@ static int setup_guest(xc_interface *xch, goto error_out; /* Tell the domain where the pages are and how many there are */ - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, ioreq_server_pfn(0)); - xc_set_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + xc_hvm_param_set(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, NR_IOREQ_SERVER_PAGES); /* @@ -538,7 +538,7 @@ static int setup_guest(xc_interface *xch, ident_pt[i] = ((i << 22) | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); munmap(ident_pt, PAGE_SIZE); - xc_set_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, + xc_hvm_param_set(xch, dom, HVM_PARAM_IDENT_PT, special_pfn(SPECIALPAGE_IDENT_PT) << PAGE_SHIFT); /* Insert JMP instruction at address 0x0 to reach entry point. */ diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index e423814..f48515a 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -51,8 +51,8 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) if ( info.hvm ) { /* HVM guests without PV drivers have no return code to modify. */ - unsigned long irq = 0; - xc_get_hvm_param(xch, domid, HVM_PARAM_CALLBACK_IRQ, &irq); + uint64_t irq = 0; + xc_hvm_param_get(xch, domid, HVM_PARAM_CALLBACK_IRQ, &irq); if ( !irq ) return 0; diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7986a31..3fe737f 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1858,7 +1858,10 @@ const xc_error *xc_get_last_error(xc_interface *handle); */ void xc_clear_last_error(xc_interface *xch); +int xc_hvm_param_set(xc_interface *handle, domid_t dom, uint32_t param, uint64_t value); +int xc_hvm_param_get(xc_interface *handle, domid_t dom, uint32_t param, uint64_t *value); +/* Deprecated: use xc_hvm_param_set/get() instead. */ int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value); int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value); diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 16cede8..39f1c28 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -896,7 +896,7 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); - unsigned long pvdriver = 0; + uint64_t pvdriver = 0; int ret; libxl_domain_type domtype = libxl__domain_type(gc, domid); @@ -906,7 +906,7 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) if (domtype == LIBXL_DOMAIN_TYPE_PV) return 1; - ret = xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); + ret = xc_hvm_param_get(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); if (ret<0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting HVM callback IRQ"); return ERROR_FAIL; @@ -5171,7 +5171,7 @@ static int libxl__domain_s3_resume(libxl__gc *gc, int domid) case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = xc_set_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); + rc = xc_hvm_param_set(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__qmp_system_wakeup(gc, domid); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 015ccb3..4c37076 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -212,18 +212,18 @@ static unsigned long timer_mode(const libxl_domain_build_info *info) static void hvm_set_conf_params(xc_interface *handle, uint32_t domid, libxl_domain_build_info *const info) { - xc_set_hvm_param(handle, domid, HVM_PARAM_PAE_ENABLED, + xc_hvm_param_set(handle, domid, HVM_PARAM_PAE_ENABLED, libxl_defbool_val(info->u.hvm.pae)); #if defined(__i386__) || defined(__x86_64__) - xc_set_hvm_param(handle, domid, HVM_PARAM_VIRIDIAN, + xc_hvm_param_set(handle, domid, HVM_PARAM_VIRIDIAN, libxl_defbool_val(info->u.hvm.viridian)); - xc_set_hvm_param(handle, domid, HVM_PARAM_HPET_ENABLED, + xc_hvm_param_set(handle, domid, HVM_PARAM_HPET_ENABLED, libxl_defbool_val(info->u.hvm.hpet)); #endif - xc_set_hvm_param(handle, domid, HVM_PARAM_TIMER_MODE, timer_mode(info)); - xc_set_hvm_param(handle, domid, HVM_PARAM_VPT_ALIGN, + xc_hvm_param_set(handle, domid, HVM_PARAM_TIMER_MODE, timer_mode(info)); + xc_hvm_param_set(handle, domid, HVM_PARAM_VPT_ALIGN, libxl_defbool_val(info->u.hvm.vpt_align)); - xc_set_hvm_param(handle, domid, HVM_PARAM_NESTEDHVM, + xc_hvm_param_set(handle, domid, HVM_PARAM_NESTEDHVM, libxl_defbool_val(info->u.hvm.nested_hvm)); } @@ -515,6 +515,7 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; + uint64_t str_mfn, cons_mfn; int i; va_map = xc_map_foreign_range(handle, domid, @@ -533,10 +534,13 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, va_hvm->checksum -= sum; munmap(va_map, XC_PAGE_SIZE); - xc_get_hvm_param(handle, domid, HVM_PARAM_STORE_PFN, store_mfn); - xc_get_hvm_param(handle, domid, HVM_PARAM_CONSOLE_PFN, console_mfn); - xc_set_hvm_param(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); - xc_set_hvm_param(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); + xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); + xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); + xc_hvm_param_set(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); + xc_hvm_param_set(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); + + *store_mfn = str_mfn; + *console_mfn = cons_mfn; xc_dom_gnttab_hvm_seed(handle, domid, *console_mfn, *store_mfn, console_domid, store_domid); return 0; @@ -1095,15 +1099,15 @@ 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; + uint64_t hvm_s_state = 0, hvm_pvdrv = 0; int ret, rc; /* Convenience aliases */ const uint32_t domid = dss->domid; if (dss->hvm) { - xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); - xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); + xc_hvm_param_get(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); + xc_hvm_param_get(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } if ((hvm_s_state == 0) && (dss->guest_evtchn.port >= 0)) { diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 54e8799..d95d459 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -546,27 +546,27 @@ static PyObject *pyxc_linux_build(XcObject *self, return pyxc_error_to_exception(self->xc_handle); } -static PyObject *pyxc_get_hvm_param(XcObject *self, +static PyObject *pyxc_hvm_param_get(XcObject *self, PyObject *args, PyObject *kwds) { uint32_t dom; int param; - unsigned long value; + uint64_t value; static char *kwd_list[] = { "domid", "param", NULL }; if ( !PyArg_ParseTupleAndKeywords(args, kwds, "ii", kwd_list, &dom, ¶m) ) return NULL; - if ( xc_get_hvm_param(self->xc_handle, dom, param, &value) != 0 ) + if ( xc_hvm_param_get(self->xc_handle, dom, param, &value) != 0 ) return pyxc_error_to_exception(self->xc_handle); - return PyLong_FromUnsignedLong(value); + return PyLong_FromUnsignedLongLong(value); } -static PyObject *pyxc_set_hvm_param(XcObject *self, +static PyObject *pyxc_hvm_param_set(XcObject *self, PyObject *args, PyObject *kwds) { @@ -579,7 +579,7 @@ static PyObject *pyxc_set_hvm_param(XcObject *self, &dom, ¶m, &value) ) return NULL; - if ( xc_set_hvm_param(self->xc_handle, dom, param, value) != 0 ) + if ( xc_hvm_param_set(self->xc_handle, dom, param, value) != 0 ) return pyxc_error_to_exception(self->xc_handle); Py_INCREF(zero); @@ -2482,7 +2482,7 @@ static PyMethodDef pyxc_methods[] = { "Returns: None on sucess. Raises exception on error.\n" }, { "hvm_get_param", - (PyCFunction)pyxc_get_hvm_param, + (PyCFunction)pyxc_hvm_param_get, METH_VARARGS | METH_KEYWORDS, "\n" "get a parameter of HVM guest OS.\n" " dom [int]: Identifier of domain to build into.\n" @@ -2490,7 +2490,7 @@ static PyMethodDef pyxc_methods[] = { "Returns: [long] value of the param.\n" }, { "hvm_set_param", - (PyCFunction)pyxc_set_hvm_param, + (PyCFunction)pyxc_hvm_param_set, METH_VARARGS | METH_KEYWORDS, "\n" "set a parameter of HVM guest OS.\n" " dom [int]: Identifier of domain to build into.\n" diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 572ab63..090df5f 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -502,9 +502,9 @@ int main(int argc, char *argv[]) } if ( int3 ) - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); else - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); if ( rc < 0 ) { ERROR("Error %d setting int3 mem_event\n", rc); @@ -522,7 +522,7 @@ int main(int argc, char *argv[]) rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, 0, xenaccess->domain_info->max_pages); - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); shutting_down = 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 Jul 05 16:49:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9I-0001mS-Cc; Sat, 05 Jul 2014 16:49:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9H-0001mA-4w for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:15 +0000 Received: from [85.158.139.211:54114] by server-9.bemta-5.messagelabs.com id 7C/6C-14363-A8C28B35; Sat, 05 Jul 2014 16:49:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404578951!8449603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15480 invoked from network); 5 Jul 2014 16:49:12 -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; 5 Jul 2014 16:49:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9D-0006G3-Ht for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9D-0002Zk-FY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:11 +0000 Date: Sat, 05 Jul 2014 16:49:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add xc_hvm_param_get/set() to get/set 64-bit values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a9daad3802a4c4bb64076369ee43a90b390b351 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:50 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 libxc: add xc_hvm_param_get/set() to get/set 64-bit values HVMOP_get_param and HVMOP_set_param take a uint32_t for the parameter index and a uint64_t for the value. So add xc_hvm_param_get() and xc_hvm_param_set() that take the same types. The existing xc_get_hvm_param() and xc_set_hvm_param() are retained for compatibility but are deprecated. Signed-off-by: David Vrabel Acked-by: Ian Campbell [ ijc -- dropped one hunk against xen-access.c which didn't apply due to intervening changes ] --- tools/libxc/xc_cpuid_x86.c | 11 ++++----- tools/libxc/xc_dom_arm.c | 8 +++--- tools/libxc/xc_domain.c | 21 +++++++++++++++++- tools/libxc/xc_domain_restore.c | 30 +++++++++++++------------- tools/libxc/xc_domain_save.c | 39 +++++++++++----------------------- tools/libxc/xc_hvm_build_x86.c | 20 +++++++++--------- tools/libxc/xc_resume.c | 4 +- tools/libxc/xenctrl.h | 3 ++ tools/libxl/libxl.c | 6 ++-- tools/libxl/libxl_dom.c | 30 +++++++++++++++----------- tools/python/xen/lowlevel/xc/xc.c | 16 +++++++------- tools/tests/xen-access/xen-access.c | 6 ++-- 12 files changed, 102 insertions(+), 92 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 4772ca7..8acb9fb 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -276,13 +276,12 @@ static void xc_cpuid_hvm_policy( { DECLARE_DOMCTL; char brand[13]; - unsigned long nestedhvm; - unsigned long pae; + uint64_t val; int is_pae, is_nestedhvm; uint64_t xfeature_mask; - xc_get_hvm_param(xch, domid, HVM_PARAM_PAE_ENABLED, &pae); - is_pae = !!pae; + xc_hvm_param_get(xch, domid, HVM_PARAM_PAE_ENABLED, &val); + is_pae = !!val; /* Detecting Xen's atitude towards XSAVE */ memset(&domctl, 0, sizeof(domctl)); @@ -291,8 +290,8 @@ static void xc_cpuid_hvm_policy( do_domctl(xch, &domctl); xfeature_mask = domctl.u.vcpuextstate.xfeature_mask; - xc_get_hvm_param(xch, domid, HVM_PARAM_NESTEDHVM, &nestedhvm); - is_nestedhvm = !!nestedhvm; + xc_hvm_param_get(xch, domid, HVM_PARAM_NESTEDHVM, &val); + is_nestedhvm = !!val; switch ( input[0] ) { diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index cc64363..10f6bcb 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -80,14 +80,14 @@ static int alloc_magic_pages(struct xc_dom_image *dom) xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, dom->console_pfn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, dom->xenstore_pfn); /* allocated by toolstack */ - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_EVTCHN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_EVTCHN, dom->console_evtchn); - xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_EVTCHN, + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_EVTCHN, dom->xenstore_evtchn); return 0; diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 65d9a08..0230c6c 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1264,7 +1264,7 @@ int xc_domain_send_trigger(xc_interface *xch, return do_domctl(xch, &domctl); } -int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value) +int xc_hvm_param_set(xc_interface *handle, domid_t dom, uint32_t param, uint64_t value) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BUFFER(xen_hvm_param_t, arg); @@ -1285,7 +1285,7 @@ int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long return rc; } -int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value) +int xc_hvm_param_get(xc_interface *handle, domid_t dom, uint32_t param, uint64_t *value) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BUFFER(xen_hvm_param_t, arg); @@ -1306,6 +1306,23 @@ int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long return rc; } +int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value) +{ + return xc_hvm_param_set(handle, dom, param, value); +} + +int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value) +{ + uint64_t v; + int ret; + + ret = xc_hvm_param_get(handle, dom, param, &v); + if (ret < 0) + return ret; + *value = v; + return 0; +} + int xc_hvm_create_ioreq_server(xc_interface *xch, domid_t domid, int handle_bufioreq, diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b80f867..08d24fa 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1646,15 +1646,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } /* should this be deferred? does it change? */ if ( pagebuf.identpt ) - xc_set_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, pagebuf.identpt); + xc_hvm_param_set(xch, dom, HVM_PARAM_IDENT_PT, pagebuf.identpt); if ( pagebuf.paging_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, pagebuf.paging_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_PAGING_RING_PFN, pagebuf.paging_ring_pfn); if ( pagebuf.access_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, pagebuf.access_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_ACCESS_RING_PFN, pagebuf.access_ring_pfn); if ( pagebuf.sharing_ring_pfn ) - xc_set_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, pagebuf.sharing_ring_pfn); + xc_hvm_param_set(xch, dom, HVM_PARAM_SHARING_RING_PFN, pagebuf.sharing_ring_pfn); if ( pagebuf.vm86_tss ) - xc_set_hvm_param(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); + xc_hvm_param_set(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); if ( pagebuf.console_pfn ) console_pfn = pagebuf.console_pfn; if ( pagebuf.vm_generationid_addr ) { @@ -1769,7 +1769,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } if (pagebuf.viridian != 0) - xc_set_hvm_param(xch, dom, HVM_PARAM_VIRIDIAN, 1); + xc_hvm_param_set(xch, dom, HVM_PARAM_VIRIDIAN, 1); /* * If we are migrating in from a host that does not support @@ -1789,16 +1789,16 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } else { if (pagebuf.nr_ioreq_server_pages != 0 && pagebuf.ioreq_server_pfn != 0) { - xc_set_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + xc_hvm_param_set(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, pagebuf.nr_ioreq_server_pages); - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, pagebuf.ioreq_server_pfn); } } if (pagebuf.acpi_ioport_location == 1) { DBGPRINTF("Use new firmware ioport from the checkpoint\n"); - xc_set_hvm_param(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); + xc_hvm_param_set(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); } else if (pagebuf.acpi_ioport_location == 0) { DBGPRINTF("Use old firmware ioport from the checkpoint\n"); } else { @@ -2329,15 +2329,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - if ( (frc = xc_set_hvm_param(xch, dom, + if ( (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_PFN, tailbuf.u.hvm.magicpfns[0])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_BUFIOREQ_PFN, tailbuf.u.hvm.magicpfns[1])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, tailbuf.u.hvm.magicpfns[2])) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_PAE_ENABLED, pae)) - || (frc = xc_set_hvm_param(xch, dom, + || (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_EVTCHN, store_evtchn)) ) { @@ -2351,7 +2351,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, PERROR("error zeroing console page"); goto out; } - if ( (frc = xc_set_hvm_param(xch, dom, + if ( (frc = xc_hvm_param_set(xch, dom, HVM_PARAM_CONSOLE_PFN, console_pfn)) ) { PERROR("error setting HVM param: %i", frc); goto out; diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 778cbde..14502c1 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1645,8 +1645,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_IDENT_PT; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_IDENT_PT, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1657,8 +1656,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_PAGING_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_PAGING_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1669,8 +1667,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_ACCESS_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_ACCESS_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1681,8 +1678,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_SHARING_RING_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_SHARING_RING_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1693,8 +1689,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_VM86_TSS; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_VM86_TSS, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_VM86_TSS, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1705,8 +1700,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_CONSOLE_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_CONSOLE_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_CONSOLE_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1717,8 +1711,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_ACPI_IOPORTS_LOCATION; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, &chunk.data); if ((chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk))) { @@ -1728,8 +1721,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_VIRIDIAN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_VIRIDIAN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_VIRIDIAN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1740,8 +1732,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_IOREQ_SERVER_PFN; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1752,8 +1743,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter chunk.id = XC_SAVE_ID_HVM_NR_IOREQ_SERVER_PAGES; chunk.data = 0; - xc_get_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, - (unsigned long *)&chunk.data); + xc_hvm_param_get(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) @@ -1827,12 +1817,9 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* Save magic-page locations. */ memset(magic_pfns, 0, sizeof(magic_pfns)); - xc_get_hvm_param(xch, dom, HVM_PARAM_IOREQ_PFN, - (unsigned long *)&magic_pfns[0]); - xc_get_hvm_param(xch, dom, HVM_PARAM_BUFIOREQ_PFN, - (unsigned long *)&magic_pfns[1]); - xc_get_hvm_param(xch, dom, HVM_PARAM_STORE_PFN, - (unsigned long *)&magic_pfns[2]); + xc_hvm_param_get(xch, dom, HVM_PARAM_IOREQ_PFN, &magic_pfns[0]); + xc_hvm_param_get(xch, dom, HVM_PARAM_BUFIOREQ_PFN, &magic_pfns[1]); + xc_hvm_param_get(xch, dom, HVM_PARAM_STORE_PFN, &magic_pfns[2]); if ( wrexact(io_fd, magic_pfns, sizeof(magic_pfns)) ) { PERROR("Error when writing to state file (7)"); diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index ed1069b..c81a25b 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -487,19 +487,19 @@ static int setup_guest(xc_interface *xch, if ( xc_clear_domain_pages(xch, dom, special_pfn(0), NR_SPECIAL_PAGES) ) goto error_out; - xc_set_hvm_param(xch, dom, HVM_PARAM_STORE_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, special_pfn(SPECIALPAGE_XENSTORE)); - xc_set_hvm_param(xch, dom, HVM_PARAM_BUFIOREQ_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_BUFIOREQ_PFN, special_pfn(SPECIALPAGE_BUFIOREQ)); - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_PFN, special_pfn(SPECIALPAGE_IOREQ)); - xc_set_hvm_param(xch, dom, HVM_PARAM_CONSOLE_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_CONSOLE_PFN, special_pfn(SPECIALPAGE_CONSOLE)); - xc_set_hvm_param(xch, dom, HVM_PARAM_PAGING_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_PAGING_RING_PFN, special_pfn(SPECIALPAGE_PAGING)); - xc_set_hvm_param(xch, dom, HVM_PARAM_ACCESS_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_ACCESS_RING_PFN, special_pfn(SPECIALPAGE_ACCESS)); - xc_set_hvm_param(xch, dom, HVM_PARAM_SHARING_RING_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); /* @@ -521,9 +521,9 @@ static int setup_guest(xc_interface *xch, goto error_out; /* Tell the domain where the pages are and how many there are */ - xc_set_hvm_param(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, + xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, ioreq_server_pfn(0)); - xc_set_hvm_param(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + xc_hvm_param_set(xch, dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES, NR_IOREQ_SERVER_PAGES); /* @@ -538,7 +538,7 @@ static int setup_guest(xc_interface *xch, ident_pt[i] = ((i << 22) | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); munmap(ident_pt, PAGE_SIZE); - xc_set_hvm_param(xch, dom, HVM_PARAM_IDENT_PT, + xc_hvm_param_set(xch, dom, HVM_PARAM_IDENT_PT, special_pfn(SPECIALPAGE_IDENT_PT) << PAGE_SHIFT); /* Insert JMP instruction at address 0x0 to reach entry point. */ diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index e423814..f48515a 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -51,8 +51,8 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) if ( info.hvm ) { /* HVM guests without PV drivers have no return code to modify. */ - unsigned long irq = 0; - xc_get_hvm_param(xch, domid, HVM_PARAM_CALLBACK_IRQ, &irq); + uint64_t irq = 0; + xc_hvm_param_get(xch, domid, HVM_PARAM_CALLBACK_IRQ, &irq); if ( !irq ) return 0; diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7986a31..3fe737f 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1858,7 +1858,10 @@ const xc_error *xc_get_last_error(xc_interface *handle); */ void xc_clear_last_error(xc_interface *xch); +int xc_hvm_param_set(xc_interface *handle, domid_t dom, uint32_t param, uint64_t value); +int xc_hvm_param_get(xc_interface *handle, domid_t dom, uint32_t param, uint64_t *value); +/* Deprecated: use xc_hvm_param_set/get() instead. */ int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value); int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value); diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 16cede8..39f1c28 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -896,7 +896,7 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); - unsigned long pvdriver = 0; + uint64_t pvdriver = 0; int ret; libxl_domain_type domtype = libxl__domain_type(gc, domid); @@ -906,7 +906,7 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) if (domtype == LIBXL_DOMAIN_TYPE_PV) return 1; - ret = xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); + ret = xc_hvm_param_get(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); if (ret<0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting HVM callback IRQ"); return ERROR_FAIL; @@ -5171,7 +5171,7 @@ static int libxl__domain_s3_resume(libxl__gc *gc, int domid) case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = xc_set_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); + rc = xc_hvm_param_set(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__qmp_system_wakeup(gc, domid); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 015ccb3..4c37076 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -212,18 +212,18 @@ static unsigned long timer_mode(const libxl_domain_build_info *info) static void hvm_set_conf_params(xc_interface *handle, uint32_t domid, libxl_domain_build_info *const info) { - xc_set_hvm_param(handle, domid, HVM_PARAM_PAE_ENABLED, + xc_hvm_param_set(handle, domid, HVM_PARAM_PAE_ENABLED, libxl_defbool_val(info->u.hvm.pae)); #if defined(__i386__) || defined(__x86_64__) - xc_set_hvm_param(handle, domid, HVM_PARAM_VIRIDIAN, + xc_hvm_param_set(handle, domid, HVM_PARAM_VIRIDIAN, libxl_defbool_val(info->u.hvm.viridian)); - xc_set_hvm_param(handle, domid, HVM_PARAM_HPET_ENABLED, + xc_hvm_param_set(handle, domid, HVM_PARAM_HPET_ENABLED, libxl_defbool_val(info->u.hvm.hpet)); #endif - xc_set_hvm_param(handle, domid, HVM_PARAM_TIMER_MODE, timer_mode(info)); - xc_set_hvm_param(handle, domid, HVM_PARAM_VPT_ALIGN, + xc_hvm_param_set(handle, domid, HVM_PARAM_TIMER_MODE, timer_mode(info)); + xc_hvm_param_set(handle, domid, HVM_PARAM_VPT_ALIGN, libxl_defbool_val(info->u.hvm.vpt_align)); - xc_set_hvm_param(handle, domid, HVM_PARAM_NESTEDHVM, + xc_hvm_param_set(handle, domid, HVM_PARAM_NESTEDHVM, libxl_defbool_val(info->u.hvm.nested_hvm)); } @@ -515,6 +515,7 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; + uint64_t str_mfn, cons_mfn; int i; va_map = xc_map_foreign_range(handle, domid, @@ -533,10 +534,13 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, va_hvm->checksum -= sum; munmap(va_map, XC_PAGE_SIZE); - xc_get_hvm_param(handle, domid, HVM_PARAM_STORE_PFN, store_mfn); - xc_get_hvm_param(handle, domid, HVM_PARAM_CONSOLE_PFN, console_mfn); - xc_set_hvm_param(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); - xc_set_hvm_param(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); + xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); + xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); + xc_hvm_param_set(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); + xc_hvm_param_set(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); + + *store_mfn = str_mfn; + *console_mfn = cons_mfn; xc_dom_gnttab_hvm_seed(handle, domid, *console_mfn, *store_mfn, console_domid, store_domid); return 0; @@ -1095,15 +1099,15 @@ 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; + uint64_t hvm_s_state = 0, hvm_pvdrv = 0; int ret, rc; /* Convenience aliases */ const uint32_t domid = dss->domid; if (dss->hvm) { - xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); - xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); + xc_hvm_param_get(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); + xc_hvm_param_get(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } if ((hvm_s_state == 0) && (dss->guest_evtchn.port >= 0)) { diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 54e8799..d95d459 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -546,27 +546,27 @@ static PyObject *pyxc_linux_build(XcObject *self, return pyxc_error_to_exception(self->xc_handle); } -static PyObject *pyxc_get_hvm_param(XcObject *self, +static PyObject *pyxc_hvm_param_get(XcObject *self, PyObject *args, PyObject *kwds) { uint32_t dom; int param; - unsigned long value; + uint64_t value; static char *kwd_list[] = { "domid", "param", NULL }; if ( !PyArg_ParseTupleAndKeywords(args, kwds, "ii", kwd_list, &dom, ¶m) ) return NULL; - if ( xc_get_hvm_param(self->xc_handle, dom, param, &value) != 0 ) + if ( xc_hvm_param_get(self->xc_handle, dom, param, &value) != 0 ) return pyxc_error_to_exception(self->xc_handle); - return PyLong_FromUnsignedLong(value); + return PyLong_FromUnsignedLongLong(value); } -static PyObject *pyxc_set_hvm_param(XcObject *self, +static PyObject *pyxc_hvm_param_set(XcObject *self, PyObject *args, PyObject *kwds) { @@ -579,7 +579,7 @@ static PyObject *pyxc_set_hvm_param(XcObject *self, &dom, ¶m, &value) ) return NULL; - if ( xc_set_hvm_param(self->xc_handle, dom, param, value) != 0 ) + if ( xc_hvm_param_set(self->xc_handle, dom, param, value) != 0 ) return pyxc_error_to_exception(self->xc_handle); Py_INCREF(zero); @@ -2482,7 +2482,7 @@ static PyMethodDef pyxc_methods[] = { "Returns: None on sucess. Raises exception on error.\n" }, { "hvm_get_param", - (PyCFunction)pyxc_get_hvm_param, + (PyCFunction)pyxc_hvm_param_get, METH_VARARGS | METH_KEYWORDS, "\n" "get a parameter of HVM guest OS.\n" " dom [int]: Identifier of domain to build into.\n" @@ -2490,7 +2490,7 @@ static PyMethodDef pyxc_methods[] = { "Returns: [long] value of the param.\n" }, { "hvm_set_param", - (PyCFunction)pyxc_set_hvm_param, + (PyCFunction)pyxc_hvm_param_set, METH_VARARGS | METH_KEYWORDS, "\n" "set a parameter of HVM guest OS.\n" " dom [int]: Identifier of domain to build into.\n" diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 572ab63..090df5f 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -502,9 +502,9 @@ int main(int argc, char *argv[]) } if ( int3 ) - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); else - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); if ( rc < 0 ) { ERROR("Error %d setting int3 mem_event\n", rc); @@ -522,7 +522,7 @@ int main(int argc, char *argv[]) rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, 0, xenaccess->domain_info->max_pages); - rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + rc = xc_hvm_param_set(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); shutting_down = 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 Jul 05 16:49:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9R-0001nn-GK; Sat, 05 Jul 2014 16:49:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9Q-0001nY-AF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:24 +0000 Received: from [193.109.254.147:15859] by server-9.bemta-14.messagelabs.com id 4C/D5-14237-39C28B35; Sat, 05 Jul 2014 16:49:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1404578962!15688163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15294 invoked from network); 5 Jul 2014 16:49:22 -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; 5 Jul 2014 16:49:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9N-0006G9-Qj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9N-0002aB-Ld for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:21 +0000 Date: Sat, 05 Jul 2014 16:49:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add libxl__random_bytes() which fills a buffer with random bytes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a2ba5cb7ec7a87a4c2b023f4f0ea61d19fc360a Author: David Vrabel AuthorDate: Wed Jun 18 17:12:51 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 libxl: add libxl__random_bytes() which fills a buffer with random bytes The random bytes are obtained from /dev/urandom and are suitable for almost all uses (except for generating long-lived secure keys). Documentation suggests that /dev/urandom is widely available on Unix-like systems (such FreeBSD and NetBSD). A public libxl_random_bytes() (or similar) could be trivially added, if this required in the future. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_utils.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a0d4f24..a9343e8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3180,6 +3180,8 @@ int libxl__uint64_parse_json(libxl__gc *gc, const libxl__json_object *o, int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, char **p); +int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); + #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 16b734e..0001ab8 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -1014,6 +1014,28 @@ int libxl_domid_valid_guest(uint32_t domid) } /* + * Fill @buf with @len random bytes. + */ +int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len) +{ + static const char *dev = "/dev/urandom"; + int fd; + int ret; + + fd = open(dev, O_RDONLY | O_CLOEXEC); + if (fd < 0) { + LOGE(ERROR, "failed to open \"%s\"", dev); + return ERROR_FAIL; + } + + ret = libxl_read_exactly(CTX, fd, buf, len, dev, NULL); + + close(fd); + + return ret; +} + +/* * Local variables: * mode: C * c-basic-offset: 4 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:49:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9R-0001nn-GK; Sat, 05 Jul 2014 16:49:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9Q-0001nY-AF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:24 +0000 Received: from [193.109.254.147:15859] by server-9.bemta-14.messagelabs.com id 4C/D5-14237-39C28B35; Sat, 05 Jul 2014 16:49:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1404578962!15688163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15294 invoked from network); 5 Jul 2014 16:49:22 -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; 5 Jul 2014 16:49:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9N-0006G9-Qj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9N-0002aB-Ld for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:21 +0000 Date: Sat, 05 Jul 2014 16:49:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add libxl__random_bytes() which fills a buffer with random bytes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a2ba5cb7ec7a87a4c2b023f4f0ea61d19fc360a Author: David Vrabel AuthorDate: Wed Jun 18 17:12:51 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 libxl: add libxl__random_bytes() which fills a buffer with random bytes The random bytes are obtained from /dev/urandom and are suitable for almost all uses (except for generating long-lived secure keys). Documentation suggests that /dev/urandom is widely available on Unix-like systems (such FreeBSD and NetBSD). A public libxl_random_bytes() (or similar) could be trivially added, if this required in the future. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_utils.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a0d4f24..a9343e8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3180,6 +3180,8 @@ int libxl__uint64_parse_json(libxl__gc *gc, const libxl__json_object *o, int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, char **p); +int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); + #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 16b734e..0001ab8 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -1014,6 +1014,28 @@ int libxl_domid_valid_guest(uint32_t domid) } /* + * Fill @buf with @len random bytes. + */ +int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len) +{ + static const char *dev = "/dev/urandom"; + int fd; + int ret; + + fd = open(dev, O_RDONLY | O_CLOEXEC); + if (fd < 0) { + LOGE(ERROR, "failed to open \"%s\"", dev); + return ERROR_FAIL; + } + + ret = libxl_read_exactly(CTX, fd, buf, len, dev, NULL); + + close(fd); + + return ret; +} + +/* * Local variables: * mode: C * c-basic-offset: 4 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:49:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9b-0001pn-Kq; Sat, 05 Jul 2014 16:49:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9a-0001pZ-Pb for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:34 +0000 Received: from [85.158.139.211:49793] by server-15.bemta-5.messagelabs.com id 71/94-19516-E9C28B35; Sat, 05 Jul 2014 16:49:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404578972!13815571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13067 invoked from network); 5 Jul 2014 16:49:33 -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; 5 Jul 2014 16:49:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9Y-0006GH-4y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9X-0002aa-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:31 +0000 Date: Sat, 05 Jul 2014 16:49:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: add helper functions to get/set HVM params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daacd357a93ea04ddfc138144b94921742006355 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:52 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 hvmloader: add helper functions to get/set HVM params Signed-off-by: David Vrabel Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/firmware/hvmloader/Makefile | 1 + tools/firmware/hvmloader/hvm_param.c | 36 ++++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/hvmloader.c | 14 +----------- tools/firmware/hvmloader/util.h | 9 ++++++++ tools/firmware/hvmloader/xenbus.c | 14 ++++-------- 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 00ee952..46a79c5 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -31,6 +31,7 @@ CFLAGS += $(CFLAGS_xeninclude) OBJS = hvmloader.o mp_tables.o util.o smbios.o OBJS += smp.o cacheattr.o xenbus.o OBJS += e820.o pci.o pir.o ctype.o +OBJS += hvm_param.o ifeq ($(debug),y) OBJS += tests.o endif diff --git a/tools/firmware/hvmloader/hvm_param.c b/tools/firmware/hvmloader/hvm_param.c new file mode 100644 index 0000000..f7d8720 --- /dev/null +++ b/tools/firmware/hvmloader/hvm_param.c @@ -0,0 +1,36 @@ +/* + * hvm_param.c: get/set HVM params. + * + * Copyright (C) 2014 Citrix Systems R&D Ltd. + */ +#include "util.h" +#include "config.h" +#include "hypercall.h" + +#include + +int hvm_param_get(uint32_t index, uint64_t *value) +{ + struct xen_hvm_param p; + int ret; + + p.domid = DOMID_SELF; + p.index = index; + + ret = hypercall_hvm_op(HVMOP_get_param, &p); + if (ret == 0) + *value = p.value; + + return ret; +} + +int hvm_param_set(uint32_t index, uint64_t value) +{ + struct xen_hvm_param p; + + p.domid = DOMID_SELF; + p.index = index; + p.value = value; + + return hypercall_hvm_op(HVMOP_set_param, &p); +} diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 1cc8cf2..7b0da38 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -176,14 +176,10 @@ static void cmos_write_memory_size(void) static void init_vm86_tss(void) { void *tss; - struct xen_hvm_param p; tss = mem_alloc(128, 128); memset(tss, 0, 128); - p.domid = DOMID_SELF; - p.index = HVM_PARAM_VM86_TSS; - p.value = virt_to_phys(tss); - hypercall_hvm_op(HVMOP_set_param, &p); + hvm_param_set(HVM_PARAM_VM86_TSS, virt_to_phys(tss)); printf("vm86 TSS at %08lx\n", virt_to_phys(tss)); } @@ -314,12 +310,6 @@ int main(void) if ( acpi_enabled ) { - struct xen_hvm_param p = { - .domid = DOMID_SELF, - .index = HVM_PARAM_ACPI_IOPORTS_LOCATION, - .value = 1, - }; - if ( bios->acpi_build_tables ) { printf("Loading ACPI ...\n"); @@ -328,7 +318,7 @@ int main(void) acpi_enable_sci(); - hypercall_hvm_op(HVMOP_set_param, &p); + hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); } init_vm86_tss(); diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 46d32b9..a70e4aa 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -210,6 +210,15 @@ const char *xenstore_read(const char *path, const char *default_resp); */ int xenstore_write(const char *path, const char *value); + +/* Get a HVM param. + */ +int hvm_param_get(uint32_t index, uint64_t *value); + +/* Set a HVM param. + */ +int hvm_param_set(uint32_t index, uint64_t value); + /* Setup PCI bus */ void pci_setup(void); diff --git a/tools/firmware/hvmloader/xenbus.c b/tools/firmware/hvmloader/xenbus.c index fe72e97..64c2176 100644 --- a/tools/firmware/hvmloader/xenbus.c +++ b/tools/firmware/hvmloader/xenbus.c @@ -41,21 +41,17 @@ static char payload[XENSTORE_PAYLOAD_MAX + 1]; /* Unmarshalling area */ * Call once, before any other xenbus actions. */ void xenbus_setup(void) { - xen_hvm_param_t param; + uint64_t val; /* Ask Xen where the xenbus shared page is. */ - param.domid = DOMID_SELF; - param.index = HVM_PARAM_STORE_PFN; - if ( hypercall_hvm_op(HVMOP_get_param, ¶m) ) + if ( hvm_param_get(HVM_PARAM_STORE_PFN, &val) ) BUG(); - rings = (void *) (unsigned long) (param.value << PAGE_SHIFT); + rings = (void *) (unsigned long) (val << PAGE_SHIFT); /* Ask Xen where the xenbus event channel is. */ - param.domid = DOMID_SELF; - param.index = HVM_PARAM_STORE_EVTCHN; - if ( hypercall_hvm_op(HVMOP_get_param, ¶m) ) + if ( hvm_param_get(HVM_PARAM_STORE_EVTCHN, &val) ) BUG(); - event = param.value; + event = val; printf("Xenbus rings @0x%lx, event channel %lu\n", (unsigned long) rings, (unsigned long) 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 Sat Jul 05 16:49:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9b-0001pn-Kq; Sat, 05 Jul 2014 16:49:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9a-0001pZ-Pb for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:34 +0000 Received: from [85.158.139.211:49793] by server-15.bemta-5.messagelabs.com id 71/94-19516-E9C28B35; Sat, 05 Jul 2014 16:49:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404578972!13815571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13067 invoked from network); 5 Jul 2014 16:49:33 -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; 5 Jul 2014 16:49:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9Y-0006GH-4y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9X-0002aa-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:31 +0000 Date: Sat, 05 Jul 2014 16:49:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: add helper functions to get/set HVM params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daacd357a93ea04ddfc138144b94921742006355 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:52 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 hvmloader: add helper functions to get/set HVM params Signed-off-by: David Vrabel Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/firmware/hvmloader/Makefile | 1 + tools/firmware/hvmloader/hvm_param.c | 36 ++++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/hvmloader.c | 14 +----------- tools/firmware/hvmloader/util.h | 9 ++++++++ tools/firmware/hvmloader/xenbus.c | 14 ++++-------- 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 00ee952..46a79c5 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -31,6 +31,7 @@ CFLAGS += $(CFLAGS_xeninclude) OBJS = hvmloader.o mp_tables.o util.o smbios.o OBJS += smp.o cacheattr.o xenbus.o OBJS += e820.o pci.o pir.o ctype.o +OBJS += hvm_param.o ifeq ($(debug),y) OBJS += tests.o endif diff --git a/tools/firmware/hvmloader/hvm_param.c b/tools/firmware/hvmloader/hvm_param.c new file mode 100644 index 0000000..f7d8720 --- /dev/null +++ b/tools/firmware/hvmloader/hvm_param.c @@ -0,0 +1,36 @@ +/* + * hvm_param.c: get/set HVM params. + * + * Copyright (C) 2014 Citrix Systems R&D Ltd. + */ +#include "util.h" +#include "config.h" +#include "hypercall.h" + +#include + +int hvm_param_get(uint32_t index, uint64_t *value) +{ + struct xen_hvm_param p; + int ret; + + p.domid = DOMID_SELF; + p.index = index; + + ret = hypercall_hvm_op(HVMOP_get_param, &p); + if (ret == 0) + *value = p.value; + + return ret; +} + +int hvm_param_set(uint32_t index, uint64_t value) +{ + struct xen_hvm_param p; + + p.domid = DOMID_SELF; + p.index = index; + p.value = value; + + return hypercall_hvm_op(HVMOP_set_param, &p); +} diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 1cc8cf2..7b0da38 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -176,14 +176,10 @@ static void cmos_write_memory_size(void) static void init_vm86_tss(void) { void *tss; - struct xen_hvm_param p; tss = mem_alloc(128, 128); memset(tss, 0, 128); - p.domid = DOMID_SELF; - p.index = HVM_PARAM_VM86_TSS; - p.value = virt_to_phys(tss); - hypercall_hvm_op(HVMOP_set_param, &p); + hvm_param_set(HVM_PARAM_VM86_TSS, virt_to_phys(tss)); printf("vm86 TSS at %08lx\n", virt_to_phys(tss)); } @@ -314,12 +310,6 @@ int main(void) if ( acpi_enabled ) { - struct xen_hvm_param p = { - .domid = DOMID_SELF, - .index = HVM_PARAM_ACPI_IOPORTS_LOCATION, - .value = 1, - }; - if ( bios->acpi_build_tables ) { printf("Loading ACPI ...\n"); @@ -328,7 +318,7 @@ int main(void) acpi_enable_sci(); - hypercall_hvm_op(HVMOP_set_param, &p); + hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); } init_vm86_tss(); diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 46d32b9..a70e4aa 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -210,6 +210,15 @@ const char *xenstore_read(const char *path, const char *default_resp); */ int xenstore_write(const char *path, const char *value); + +/* Get a HVM param. + */ +int hvm_param_get(uint32_t index, uint64_t *value); + +/* Set a HVM param. + */ +int hvm_param_set(uint32_t index, uint64_t value); + /* Setup PCI bus */ void pci_setup(void); diff --git a/tools/firmware/hvmloader/xenbus.c b/tools/firmware/hvmloader/xenbus.c index fe72e97..64c2176 100644 --- a/tools/firmware/hvmloader/xenbus.c +++ b/tools/firmware/hvmloader/xenbus.c @@ -41,21 +41,17 @@ static char payload[XENSTORE_PAYLOAD_MAX + 1]; /* Unmarshalling area */ * Call once, before any other xenbus actions. */ void xenbus_setup(void) { - xen_hvm_param_t param; + uint64_t val; /* Ask Xen where the xenbus shared page is. */ - param.domid = DOMID_SELF; - param.index = HVM_PARAM_STORE_PFN; - if ( hypercall_hvm_op(HVMOP_get_param, ¶m) ) + if ( hvm_param_get(HVM_PARAM_STORE_PFN, &val) ) BUG(); - rings = (void *) (unsigned long) (param.value << PAGE_SHIFT); + rings = (void *) (unsigned long) (val << PAGE_SHIFT); /* Ask Xen where the xenbus event channel is. */ - param.domid = DOMID_SELF; - param.index = HVM_PARAM_STORE_EVTCHN; - if ( hypercall_hvm_op(HVMOP_get_param, ¶m) ) + if ( hvm_param_get(HVM_PARAM_STORE_EVTCHN, &val) ) BUG(); - event = param.value; + event = val; printf("Xenbus rings @0x%lx, event channel %lu\n", (unsigned long) rings, (unsigned long) 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 Sat Jul 05 16:49:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9l-0001rd-Nb; Sat, 05 Jul 2014 16:49:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9k-0001rQ-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:45 +0000 Received: from [85.158.137.68:48562] by server-10.bemta-3.messagelabs.com id 8B/FC-32650-8AC28B35; Sat, 05 Jul 2014 16:49:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404578982!10496973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29584 invoked from network); 5 Jul 2014 16:49:43 -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 Jul 2014 16:49:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9i-0006GN-F0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9i-0002b1-8L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:42 +0000 Date: Sat, 05 Jul 2014 16:49:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm: add HVM_PARAM_VM_GENERATION_ID_ADDR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf19240f999db9f8c6eb90399cffc325d055af82 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:53 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 hvm: add HVM_PARAM_VM_GENERATION_ID_ADDR HVM_PARAM_VM_GENERATION_ID_ADDR is the guest physical address of the VM Generation ID. This parameter will be written by hvmloader and read by the toolstack when updating the gen. ID (e.g., after restoring from a snapshot). A HVM parameter is easier for the save/restore code to work with (than a XenStore key). Signed-off-by: David Vrabel Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/include/public/hvm/params.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index f830bdd..614ff5f 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -148,6 +148,9 @@ #define HVM_PARAM_IOREQ_SERVER_PFN 32 #define HVM_PARAM_NR_IOREQ_SERVER_PAGES 33 -#define HVM_NR_PARAMS 34 +/* Location of the VM Generation ID in guest physical address space. */ +#define HVM_PARAM_VM_GENERATION_ID_ADDR 34 + +#define HVM_NR_PARAMS 35 #endif /* __XEN_PUBLIC_HVM_PARAMS_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 Jul 05 16:49:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9l-0001rd-Nb; Sat, 05 Jul 2014 16:49:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9k-0001rQ-VL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:45 +0000 Received: from [85.158.137.68:48562] by server-10.bemta-3.messagelabs.com id 8B/FC-32650-8AC28B35; Sat, 05 Jul 2014 16:49:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404578982!10496973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29584 invoked from network); 5 Jul 2014 16:49:43 -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 Jul 2014 16:49:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9i-0006GN-F0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9i-0002b1-8L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:42 +0000 Date: Sat, 05 Jul 2014 16:49:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm: add HVM_PARAM_VM_GENERATION_ID_ADDR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf19240f999db9f8c6eb90399cffc325d055af82 Author: David Vrabel AuthorDate: Wed Jun 18 17:12:53 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:21 2014 +0100 hvm: add HVM_PARAM_VM_GENERATION_ID_ADDR HVM_PARAM_VM_GENERATION_ID_ADDR is the guest physical address of the VM Generation ID. This parameter will be written by hvmloader and read by the toolstack when updating the gen. ID (e.g., after restoring from a snapshot). A HVM parameter is easier for the save/restore code to work with (than a XenStore key). Signed-off-by: David Vrabel Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/include/public/hvm/params.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index f830bdd..614ff5f 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -148,6 +148,9 @@ #define HVM_PARAM_IOREQ_SERVER_PFN 32 #define HVM_PARAM_NR_IOREQ_SERVER_PAGES 33 -#define HVM_NR_PARAMS 34 +/* Location of the VM Generation ID in guest physical address space. */ +#define HVM_PARAM_VM_GENERATION_ID_ADDR 34 + +#define HVM_NR_PARAMS 35 #endif /* __XEN_PUBLIC_HVM_PARAMS_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 Jul 05 16:49:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9x-0001tb-QX; Sat, 05 Jul 2014 16:49:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9w-0001tL-5d for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:56 +0000 Received: from [85.158.139.211:50313] by server-3.bemta-5.messagelabs.com id 29/F8-01676-3BC28B35; Sat, 05 Jul 2014 16:49:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404578992!13866738!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30252 invoked from network); 5 Jul 2014 16:49:53 -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; 5 Jul 2014 16:49:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9s-0006GT-MF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9s-0002bN-Jl for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:52 +0000 Date: Sat, 05 Jul 2014 16:49:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc, libxl, hvmloader: strip out outdated VM generation ID implementation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d3946cd9bf854a5dffb627c21bdb5112b8a25ac Author: David Vrabel AuthorDate: Wed Jun 18 17:12:54 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 libxc, libxl, hvmloader: strip out outdated VM generation ID implementation The VM generation ID support in libxc/libxl was based on a draft specification which subsequently changed considerably. Remove much of the code in anticipation of introducing something simpler that conforms to the current specification from Microsoft. Switch to using a HVM param (HVM_PARAM_VM_GENERATION_ID_ADDR) instead of the hvmloader/generation-id-address XenStore key. This simplifies save/restore since it only needs to transfer the value of this param. There are no changes to the migration stream format or the public libxl API. Signed-off-by: David Vrabel Acked-by: Ian Campbell [ ijc -- updated xc_nomigrate.c for interface change ] --- tools/firmware/hvmloader/acpi/build.c | 9 ++---- tools/libxc/xc_domain_restore.c | 44 +++------------------------------ tools/libxc/xc_domain_save.c | 5 +-- tools/libxc/xc_nomigrate.c | 6 +--- tools/libxc/xenguest.h | 8 +---- tools/libxl/libxl_create.c | 12 ++------ tools/libxl/libxl_dom.c | 25 +----------------- tools/libxl/libxl_internal.h | 8 +---- tools/libxl/libxl_save_callout.c | 10 +++---- tools/libxl/libxl_save_helper.c | 9 ++---- tools/libxl/libxl_save_msgs_gen.pl | 3 +- 11 files changed, 28 insertions(+), 111 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 5c42d89..1431296 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -24,6 +24,7 @@ #include "../config.h" #include "../util.h" #include +#include #define ACPI_MAX_SECONDARY_TABLES 16 @@ -362,7 +363,6 @@ static int construct_secondary_tables(unsigned long *table_ptrs, static int new_vm_gid(struct acpi_info *acpi_info) { uint64_t vm_gid[2], *buf; - char addr[12]; const char * s; char *end; @@ -383,12 +383,9 @@ static int new_vm_gid(struct acpi_info *acpi_info) return 0; memcpy(buf, vm_gid, sizeof(vm_gid)); - /* set into ACPI table and XenStore the address */ + /* set into ACPI table and HVM param the address */ acpi_info->vm_gid_addr = virt_to_phys(buf); - if ( snprintf(addr, sizeof(addr), "0x%lx", virt_to_phys(buf)) - >= sizeof(addr) ) - return 0; - xenstore_write("hvmloader/generation-id-address", addr); + hvm_param_set(HVM_PARAM_VM_GENERATION_ID_ADDR, acpi_info->vm_gid_addr); return 1; } diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 08d24fa..b94887f 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1431,8 +1431,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks) { DECLARE_DOMCTL; @@ -1657,44 +1656,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, xc_hvm_param_set(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); if ( pagebuf.console_pfn ) console_pfn = pagebuf.console_pfn; - if ( pagebuf.vm_generationid_addr ) { - if ( !no_incr_generationid ) { - unsigned int offset; - unsigned char *buf; - unsigned long long generationid; - - /* - * Map the VM generation id buffer and inject the new value. - */ - - pfn = pagebuf.vm_generationid_addr >> PAGE_SHIFT; - offset = pagebuf.vm_generationid_addr & (PAGE_SIZE - 1); - - if ( (pfn >= dinfo->p2m_size) || - (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) - { - ERROR("generation id buffer frame is bad"); - goto out; - } - - mfn = ctx->p2m[pfn]; - buf = xc_map_foreign_range(xch, dom, PAGE_SIZE, - PROT_READ | PROT_WRITE, mfn); - if ( buf == NULL ) - { - ERROR("xc_map_foreign_range for generation id" - " buffer failed"); - goto out; - } - - generationid = *(unsigned long long *)(buf + offset); - *(unsigned long long *)(buf + offset) = generationid + 1; - - munmap(buf, PAGE_SIZE); - } - - *vm_generationid_addr = pagebuf.vm_generationid_addr; - } + if ( pagebuf.vm_generationid_addr ) + xc_hvm_param_set(xch, dom, HVM_PARAM_VM_GENERATION_ID_ADDR, + pagebuf.vm_generationid_addr); break; /* our work here is done */ } diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 14502c1..b5a772b 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -802,8 +802,7 @@ static int save_tsc_info(xc_interface *xch, uint32_t dom, int io_fd) int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr) + struct save_callbacks* callbacks, int hvm) { xc_dominfo_t info; DECLARE_DOMCTL; @@ -1634,7 +1633,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } chunk = { 0, }; chunk.id = XC_SAVE_ID_HVM_GENERATION_ID_ADDR; - chunk.data = vm_generationid_addr; + xc_hvm_param_get(xch, dom, HVM_PARAM_VM_GENERATION_ID_ADDR, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c index fb6d53e..76978a0 100644 --- a/tools/libxc/xc_nomigrate.c +++ b/tools/libxc/xc_nomigrate.c @@ -23,8 +23,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr) + struct save_callbacks* callbacks, int hvm) { errno = ENOSYS; return -1; @@ -35,8 +34,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks) { errno = ENOSYS; diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 1f216cd..40bbac8 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -86,8 +86,7 @@ struct save_callbacks { */ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr); + struct save_callbacks* callbacks, int hvm); /* callbacks provided by xc_domain_restore */ @@ -113,9 +112,7 @@ struct restore_callbacks { * @parm hvm non-zero if this is a HVM restore * @parm pae non-zero if this HVM domain has PAE support enabled * @parm superpages non-zero to allocate guest memory with superpages - * @parm no_incr_generationid non-zero if generation id is NOT to be incremented * @parm checkpointed_stream non-zero if the far end of the stream is using checkpointing - * @parm vm_generationid_addr returned with the address of the generation id buffer * @parm callbacks non-NULL to receive a callback to restore toolstack * specific data * @return 0 on success, -1 on failure @@ -125,8 +122,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks); /** * xc_domain_restore writes a file to disk that contains the device diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8cc3ca5..0686f96 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -578,12 +578,7 @@ retry_transaction: ARRAY_SIZE(rwperm)); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_mkdir(gc, t, - libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), - rwperm, ARRAY_SIZE(rwperm)); - - vm_list = libxl_list_vm(ctx, &nb_vm); + vm_list = libxl_list_vm(ctx, &nb_vm); if (!vm_list) { LOG(ERROR, "cannot get number of running guests"); rc = ERROR_FAIL; @@ -954,7 +949,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, goto out; } libxl__xc_domain_restore(egc, dcs, - hvm, pae, superpages, 1); + hvm, pae, superpages); return; out: @@ -962,7 +957,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, } void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, - unsigned long console_mfn, unsigned long genidad, void *user) + unsigned long console_mfn, void *user) { libxl__save_helper_state *shs = user; libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); @@ -971,7 +966,6 @@ void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, state->store_mfn = store_mfn; state->console_mfn = console_mfn; - state->vm_generationid_addr = genidad; shs->need_results = 0; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4c37076..acb0794 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -304,7 +304,6 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, state->store_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->store_domid); state->console_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->console_domid); - state->vm_generationid_addr = 0; if (info->type == LIBXL_DOMAIN_TYPE_HVM) hvm_set_conf_params(ctx->xch, domid, info); @@ -322,7 +321,7 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); char *dom_path, *vm_path; xs_transaction_t t; - char **ents, **hvm_ents; + char **ents; int i, rc; rc = libxl_domain_sched_params_set(CTX, domid, &info->sched_params); @@ -359,13 +358,6 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, ? "online" : "offline"; } - hvm_ents = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - hvm_ents = libxl__calloc(gc, 3, sizeof(char *)); - hvm_ents[0] = "hvmloader/generation-id-address"; - hvm_ents[1] = GCSPRINTF("0x%lx", state->vm_generationid_addr); - } - dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { return ERROR_FAIL; @@ -376,9 +368,6 @@ retry_transaction: t = xs_transaction_start(ctx->xsh); libxl__xs_writev(gc, t, dom_path, ents); - if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_writev(gc, t, dom_path, hvm_ents); - libxl__xs_writev(gc, t, dom_path, local_ents); libxl__xs_writev(gc, t, vm_path, vms_ents); @@ -1531,7 +1520,6 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) STATE_AO_GC(dss->ao); int port; int rc = ERROR_FAIL; - unsigned long vm_generationid_addr; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1550,19 +1538,10 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { - char *path; - char *addr; - - path = GCSPRINTF("%s/hvmloader/generation-id-address", - libxl__xs_get_dompath(gc, domid)); - addr = libxl__xs_read(gc, XBT_NULL, path); - - vm_generationid_addr = (addr) ? strtoul(addr, NULL, 0) : 0; dss->hvm = 1; break; } case LIBXL_DOMAIN_TYPE_PV: - vm_generationid_addr = 0; dss->hvm = 0; break; default: @@ -1609,7 +1588,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; - libxl__xc_domain_save(egc, dss, vm_generationid_addr); + libxl__xc_domain_save(egc, dss); return; out: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a9343e8..d4f32a9 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -960,8 +960,6 @@ typedef struct { uint32_t console_domid; unsigned long console_mfn; - unsigned long vm_generationid_addr; - char *saved_state; libxl__file_reference pv_kernel; @@ -2791,8 +2789,7 @@ _hidden void libxl__domain_suspend(libxl__egc *egc, /* calls libxl__xc_domain_suspend_done when done */ -_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*, - unsigned long vm_generationid_addr); +_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*); /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ @@ -2816,8 +2813,7 @@ _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, /* calls libxl__xc_domain_restore_done when done */ _hidden void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, - int hvm, int pae, int superpages, - int no_incr_generationid); + int hvm, int pae, int superpages); /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index c35da4d..1c9f806 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -41,8 +41,7 @@ static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs); /*----- entrypoints -----*/ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, - int hvm, int pae, int superpages, - int no_incr_generationid) + int hvm, int pae, int superpages) { STATE_AO_GC(dcs->ao); @@ -59,7 +58,7 @@ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, state->store_port, state->store_domid, state->console_port, state->console_domid, - hvm, pae, superpages, no_incr_generationid, + hvm, pae, superpages, cbflags, dcs->checkpointed_stream, }; @@ -75,8 +74,7 @@ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, argnums, ARRAY_SIZE(argnums)); } -void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, - unsigned long vm_generationid_addr) +void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int r, rc, toolstack_data_fd = -1; @@ -112,7 +110,7 @@ void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, } const unsigned long argnums[] = { - dss->domid, 0, 0, dss->xcflags, dss->hvm, vm_generationid_addr, + dss->domid, 0, 0, dss->xcflags, dss->hvm, toolstack_data_fd, toolstack_data_len, cbflags, }; diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 4619fa3..74826a1 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -217,7 +217,6 @@ int main(int argc, char **argv) uint32_t max_factor = strtoul(NEXTARG,0,10); uint32_t flags = strtoul(NEXTARG,0,10); int hvm = atoi(NEXTARG); - unsigned long genidad = strtoul(NEXTARG,0,10); toolstack_save_fd = atoi(NEXTARG); toolstack_save_len = strtoul(NEXTARG,0,10); unsigned cbflags = strtoul(NEXTARG,0,10); @@ -230,7 +229,7 @@ int main(int argc, char **argv) startup("save"); r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, - &helper_save_callbacks, hvm, genidad); + &helper_save_callbacks, hvm); complete(r); } else if (!strcmp(mode,"--restore-domain")) { @@ -244,7 +243,6 @@ int main(int argc, char **argv) unsigned int hvm = strtoul(NEXTARG,0,10); unsigned int pae = strtoul(NEXTARG,0,10); int superpages = strtoul(NEXTARG,0,10); - int no_incr_genidad = strtoul(NEXTARG,0,10); unsigned cbflags = strtoul(NEXTARG,0,10); int checkpointed = strtoul(NEXTARG,0,10); assert(!*++argv); @@ -253,15 +251,14 @@ int main(int argc, char **argv) unsigned long store_mfn = 0; unsigned long console_mfn = 0; - unsigned long genidad = 0; startup("restore"); r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, - no_incr_genidad, checkpointed, &genidad, + checkpointed, &helper_restore_callbacks); - helper_stub_restore_results(store_mfn,console_mfn,genidad,0); + helper_stub_restore_results(store_mfn,console_mfn,0); complete(r); } else { diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 745e2ac..88f4921 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -32,8 +32,7 @@ our @msgs = ( [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid BLOCK tsdata)] ], [ 8, 'r', "restore_results", ['unsigned long', 'store_mfn', - 'unsigned long', 'console_mfn', - 'unsigned long', 'genidad'] ], + 'unsigned long', 'console_mfn'] ], [ 9, 'srW', "complete", [qw(int retval 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 Sat Jul 05 16:49:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:49: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 1X3T9x-0001tb-QX; Sat, 05 Jul 2014 16:49:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9w-0001tL-5d for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:56 +0000 Received: from [85.158.139.211:50313] by server-3.bemta-5.messagelabs.com id 29/F8-01676-3BC28B35; Sat, 05 Jul 2014 16:49:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404578992!13866738!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30252 invoked from network); 5 Jul 2014 16:49:53 -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; 5 Jul 2014 16:49:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3T9s-0006GT-MF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3T9s-0002bN-Jl for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:49:52 +0000 Date: Sat, 05 Jul 2014 16:49:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc, libxl, hvmloader: strip out outdated VM generation ID implementation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d3946cd9bf854a5dffb627c21bdb5112b8a25ac Author: David Vrabel AuthorDate: Wed Jun 18 17:12:54 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 libxc, libxl, hvmloader: strip out outdated VM generation ID implementation The VM generation ID support in libxc/libxl was based on a draft specification which subsequently changed considerably. Remove much of the code in anticipation of introducing something simpler that conforms to the current specification from Microsoft. Switch to using a HVM param (HVM_PARAM_VM_GENERATION_ID_ADDR) instead of the hvmloader/generation-id-address XenStore key. This simplifies save/restore since it only needs to transfer the value of this param. There are no changes to the migration stream format or the public libxl API. Signed-off-by: David Vrabel Acked-by: Ian Campbell [ ijc -- updated xc_nomigrate.c for interface change ] --- tools/firmware/hvmloader/acpi/build.c | 9 ++---- tools/libxc/xc_domain_restore.c | 44 +++------------------------------ tools/libxc/xc_domain_save.c | 5 +-- tools/libxc/xc_nomigrate.c | 6 +--- tools/libxc/xenguest.h | 8 +---- tools/libxl/libxl_create.c | 12 ++------ tools/libxl/libxl_dom.c | 25 +----------------- tools/libxl/libxl_internal.h | 8 +---- tools/libxl/libxl_save_callout.c | 10 +++---- tools/libxl/libxl_save_helper.c | 9 ++---- tools/libxl/libxl_save_msgs_gen.pl | 3 +- 11 files changed, 28 insertions(+), 111 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 5c42d89..1431296 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -24,6 +24,7 @@ #include "../config.h" #include "../util.h" #include +#include #define ACPI_MAX_SECONDARY_TABLES 16 @@ -362,7 +363,6 @@ static int construct_secondary_tables(unsigned long *table_ptrs, static int new_vm_gid(struct acpi_info *acpi_info) { uint64_t vm_gid[2], *buf; - char addr[12]; const char * s; char *end; @@ -383,12 +383,9 @@ static int new_vm_gid(struct acpi_info *acpi_info) return 0; memcpy(buf, vm_gid, sizeof(vm_gid)); - /* set into ACPI table and XenStore the address */ + /* set into ACPI table and HVM param the address */ acpi_info->vm_gid_addr = virt_to_phys(buf); - if ( snprintf(addr, sizeof(addr), "0x%lx", virt_to_phys(buf)) - >= sizeof(addr) ) - return 0; - xenstore_write("hvmloader/generation-id-address", addr); + hvm_param_set(HVM_PARAM_VM_GENERATION_ID_ADDR, acpi_info->vm_gid_addr); return 1; } diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 08d24fa..b94887f 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1431,8 +1431,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks) { DECLARE_DOMCTL; @@ -1657,44 +1656,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, xc_hvm_param_set(xch, dom, HVM_PARAM_VM86_TSS, pagebuf.vm86_tss); if ( pagebuf.console_pfn ) console_pfn = pagebuf.console_pfn; - if ( pagebuf.vm_generationid_addr ) { - if ( !no_incr_generationid ) { - unsigned int offset; - unsigned char *buf; - unsigned long long generationid; - - /* - * Map the VM generation id buffer and inject the new value. - */ - - pfn = pagebuf.vm_generationid_addr >> PAGE_SHIFT; - offset = pagebuf.vm_generationid_addr & (PAGE_SIZE - 1); - - if ( (pfn >= dinfo->p2m_size) || - (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) - { - ERROR("generation id buffer frame is bad"); - goto out; - } - - mfn = ctx->p2m[pfn]; - buf = xc_map_foreign_range(xch, dom, PAGE_SIZE, - PROT_READ | PROT_WRITE, mfn); - if ( buf == NULL ) - { - ERROR("xc_map_foreign_range for generation id" - " buffer failed"); - goto out; - } - - generationid = *(unsigned long long *)(buf + offset); - *(unsigned long long *)(buf + offset) = generationid + 1; - - munmap(buf, PAGE_SIZE); - } - - *vm_generationid_addr = pagebuf.vm_generationid_addr; - } + if ( pagebuf.vm_generationid_addr ) + xc_hvm_param_set(xch, dom, HVM_PARAM_VM_GENERATION_ID_ADDR, + pagebuf.vm_generationid_addr); break; /* our work here is done */ } diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 14502c1..b5a772b 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -802,8 +802,7 @@ static int save_tsc_info(xc_interface *xch, uint32_t dom, int io_fd) int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr) + struct save_callbacks* callbacks, int hvm) { xc_dominfo_t info; DECLARE_DOMCTL; @@ -1634,7 +1633,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } chunk = { 0, }; chunk.id = XC_SAVE_ID_HVM_GENERATION_ID_ADDR; - chunk.data = vm_generationid_addr; + xc_hvm_param_get(xch, dom, HVM_PARAM_VM_GENERATION_ID_ADDR, &chunk.data); if ( (chunk.data != 0) && wrexact(io_fd, &chunk, sizeof(chunk)) ) diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c index fb6d53e..76978a0 100644 --- a/tools/libxc/xc_nomigrate.c +++ b/tools/libxc/xc_nomigrate.c @@ -23,8 +23,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr) + struct save_callbacks* callbacks, int hvm) { errno = ENOSYS; return -1; @@ -35,8 +34,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks) { errno = ENOSYS; diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 1f216cd..40bbac8 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -86,8 +86,7 @@ struct save_callbacks { */ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, - struct save_callbacks* callbacks, int hvm, - unsigned long vm_generationid_addr); + struct save_callbacks* callbacks, int hvm); /* callbacks provided by xc_domain_restore */ @@ -113,9 +112,7 @@ struct restore_callbacks { * @parm hvm non-zero if this is a HVM restore * @parm pae non-zero if this HVM domain has PAE support enabled * @parm superpages non-zero to allocate guest memory with superpages - * @parm no_incr_generationid non-zero if generation id is NOT to be incremented * @parm checkpointed_stream non-zero if the far end of the stream is using checkpointing - * @parm vm_generationid_addr returned with the address of the generation id buffer * @parm callbacks non-NULL to receive a callback to restore toolstack * specific data * @return 0 on success, -1 on failure @@ -125,8 +122,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, int checkpointed_stream, - unsigned long *vm_generationid_addr, + int checkpointed_stream, struct restore_callbacks *callbacks); /** * xc_domain_restore writes a file to disk that contains the device diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8cc3ca5..0686f96 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -578,12 +578,7 @@ retry_transaction: ARRAY_SIZE(rwperm)); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_mkdir(gc, t, - libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), - rwperm, ARRAY_SIZE(rwperm)); - - vm_list = libxl_list_vm(ctx, &nb_vm); + vm_list = libxl_list_vm(ctx, &nb_vm); if (!vm_list) { LOG(ERROR, "cannot get number of running guests"); rc = ERROR_FAIL; @@ -954,7 +949,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, goto out; } libxl__xc_domain_restore(egc, dcs, - hvm, pae, superpages, 1); + hvm, pae, superpages); return; out: @@ -962,7 +957,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, } void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, - unsigned long console_mfn, unsigned long genidad, void *user) + unsigned long console_mfn, void *user) { libxl__save_helper_state *shs = user; libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); @@ -971,7 +966,6 @@ void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, state->store_mfn = store_mfn; state->console_mfn = console_mfn; - state->vm_generationid_addr = genidad; shs->need_results = 0; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4c37076..acb0794 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -304,7 +304,6 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, state->store_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->store_domid); state->console_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->console_domid); - state->vm_generationid_addr = 0; if (info->type == LIBXL_DOMAIN_TYPE_HVM) hvm_set_conf_params(ctx->xch, domid, info); @@ -322,7 +321,7 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); char *dom_path, *vm_path; xs_transaction_t t; - char **ents, **hvm_ents; + char **ents; int i, rc; rc = libxl_domain_sched_params_set(CTX, domid, &info->sched_params); @@ -359,13 +358,6 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, ? "online" : "offline"; } - hvm_ents = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - hvm_ents = libxl__calloc(gc, 3, sizeof(char *)); - hvm_ents[0] = "hvmloader/generation-id-address"; - hvm_ents[1] = GCSPRINTF("0x%lx", state->vm_generationid_addr); - } - dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { return ERROR_FAIL; @@ -376,9 +368,6 @@ retry_transaction: t = xs_transaction_start(ctx->xsh); libxl__xs_writev(gc, t, dom_path, ents); - if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_writev(gc, t, dom_path, hvm_ents); - libxl__xs_writev(gc, t, dom_path, local_ents); libxl__xs_writev(gc, t, vm_path, vms_ents); @@ -1531,7 +1520,6 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) STATE_AO_GC(dss->ao); int port; int rc = ERROR_FAIL; - unsigned long vm_generationid_addr; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1550,19 +1538,10 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { - char *path; - char *addr; - - path = GCSPRINTF("%s/hvmloader/generation-id-address", - libxl__xs_get_dompath(gc, domid)); - addr = libxl__xs_read(gc, XBT_NULL, path); - - vm_generationid_addr = (addr) ? strtoul(addr, NULL, 0) : 0; dss->hvm = 1; break; } case LIBXL_DOMAIN_TYPE_PV: - vm_generationid_addr = 0; dss->hvm = 0; break; default: @@ -1609,7 +1588,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; - libxl__xc_domain_save(egc, dss, vm_generationid_addr); + libxl__xc_domain_save(egc, dss); return; out: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a9343e8..d4f32a9 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -960,8 +960,6 @@ typedef struct { uint32_t console_domid; unsigned long console_mfn; - unsigned long vm_generationid_addr; - char *saved_state; libxl__file_reference pv_kernel; @@ -2791,8 +2789,7 @@ _hidden void libxl__domain_suspend(libxl__egc *egc, /* calls libxl__xc_domain_suspend_done when done */ -_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*, - unsigned long vm_generationid_addr); +_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*); /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ @@ -2816,8 +2813,7 @@ _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, /* calls libxl__xc_domain_restore_done when done */ _hidden void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, - int hvm, int pae, int superpages, - int no_incr_generationid); + int hvm, int pae, int superpages); /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index c35da4d..1c9f806 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -41,8 +41,7 @@ static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs); /*----- entrypoints -----*/ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, - int hvm, int pae, int superpages, - int no_incr_generationid) + int hvm, int pae, int superpages) { STATE_AO_GC(dcs->ao); @@ -59,7 +58,7 @@ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, state->store_port, state->store_domid, state->console_port, state->console_domid, - hvm, pae, superpages, no_incr_generationid, + hvm, pae, superpages, cbflags, dcs->checkpointed_stream, }; @@ -75,8 +74,7 @@ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, argnums, ARRAY_SIZE(argnums)); } -void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, - unsigned long vm_generationid_addr) +void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int r, rc, toolstack_data_fd = -1; @@ -112,7 +110,7 @@ void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, } const unsigned long argnums[] = { - dss->domid, 0, 0, dss->xcflags, dss->hvm, vm_generationid_addr, + dss->domid, 0, 0, dss->xcflags, dss->hvm, toolstack_data_fd, toolstack_data_len, cbflags, }; diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 4619fa3..74826a1 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -217,7 +217,6 @@ int main(int argc, char **argv) uint32_t max_factor = strtoul(NEXTARG,0,10); uint32_t flags = strtoul(NEXTARG,0,10); int hvm = atoi(NEXTARG); - unsigned long genidad = strtoul(NEXTARG,0,10); toolstack_save_fd = atoi(NEXTARG); toolstack_save_len = strtoul(NEXTARG,0,10); unsigned cbflags = strtoul(NEXTARG,0,10); @@ -230,7 +229,7 @@ int main(int argc, char **argv) startup("save"); r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, - &helper_save_callbacks, hvm, genidad); + &helper_save_callbacks, hvm); complete(r); } else if (!strcmp(mode,"--restore-domain")) { @@ -244,7 +243,6 @@ int main(int argc, char **argv) unsigned int hvm = strtoul(NEXTARG,0,10); unsigned int pae = strtoul(NEXTARG,0,10); int superpages = strtoul(NEXTARG,0,10); - int no_incr_genidad = strtoul(NEXTARG,0,10); unsigned cbflags = strtoul(NEXTARG,0,10); int checkpointed = strtoul(NEXTARG,0,10); assert(!*++argv); @@ -253,15 +251,14 @@ int main(int argc, char **argv) unsigned long store_mfn = 0; unsigned long console_mfn = 0; - unsigned long genidad = 0; startup("restore"); r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, - no_incr_genidad, checkpointed, &genidad, + checkpointed, &helper_restore_callbacks); - helper_stub_restore_results(store_mfn,console_mfn,genidad,0); + helper_stub_restore_results(store_mfn,console_mfn,0); complete(r); } else { diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 745e2ac..88f4921 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -32,8 +32,7 @@ our @msgs = ( [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid BLOCK tsdata)] ], [ 8, 'r', "restore_results", ['unsigned long', 'store_mfn', - 'unsigned long', 'console_mfn', - 'unsigned long', 'genidad'] ], + 'unsigned long', 'console_mfn'] ], [ 9, 'srW', "complete", [qw(int retval 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 Sat Jul 05 16:50:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAC-0001vj-Vd; Sat, 05 Jul 2014 16:50:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAB-0001va-Vp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:12 +0000 Received: from [193.109.254.147:55431] by server-6.bemta-14.messagelabs.com id AC/45-08262-3CC28B35; Sat, 05 Jul 2014 16:50:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1404579008!15686120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23883 invoked from network); 5 Jul 2014 16:50:09 -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; 5 Jul 2014 16:50:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TA8-0006H5-8y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TA2-0002c3-QI for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:02 +0000 Date: Sat, 05 Jul 2014 16:50:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Improve the *_FIELD() 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 9f378f487a879f9a459f3719b82578c781a0adf8 Author: Andrew Cooper AuthorDate: Wed Jun 18 18:18:37 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 tools/libxc: Improve the *_FIELD() macros The {GET,SET,MEMCPY,MEMSET_ARRAY}_FIELD() macros previously required 'dinfo->guest_width' to exist in scope, which is somewhat antisocial, and makes them awkward to use in other contexts. Update these macros to take guest width as a parameter, and in all cases pass dinfo->guest_width. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 54 ++++++++++++++++++++------------------ tools/libxc/xc_domain_save.c | 24 +++++++++-------- tools/libxc/xc_resume.c | 4 +- tools/libxc/xg_save_restore.h | 14 +++++----- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b94887f..071ab6a 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -317,7 +317,7 @@ static xen_pfn_t *load_p2m_frame_list( tot_bytes -= chunk_bytes; chunk_bytes = 0; - if ( GET_FIELD(&ctxt, vm_assist) + if ( GET_FIELD(&ctxt, vm_assist, dinfo->guest_width) & (1UL << VMASST_TYPE_pae_extended_cr3) ) *pae_extended_cr3 = 1; } @@ -2018,7 +2018,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, DPRINTF("read VCPU %d\n", i); if ( !new_ctxt_format ) - SET_FIELD(ctxt, flags, GET_FIELD(ctxt, flags) | VGCF_online); + SET_FIELD(ctxt, flags, + GET_FIELD(ctxt, flags, dinfo->guest_width) | VGCF_online, + dinfo->guest_width); if ( i == 0 ) { @@ -2032,7 +2034,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, * xc_domain_save and therefore the PFN is found in the * edx register. */ - pfn = GET_FIELD(ctxt, user_regs.edx); + pfn = GET_FIELD(ctxt, user_regs.edx, dinfo->guest_width); if ( (pfn >= dinfo->p2m_size) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) { @@ -2040,7 +2042,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } mfn = ctx->p2m[pfn]; - SET_FIELD(ctxt, user_regs.edx, mfn); + SET_FIELD(ctxt, user_regs.edx, mfn, dinfo->guest_width); start_info = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); if ( start_info == NULL ) @@ -2049,39 +2051,39 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - SET_FIELD(start_info, nr_pages, dinfo->p2m_size); - SET_FIELD(start_info, shared_info, shared_info_frame< dinfo->p2m_size ) + SET_FIELD(start_info, nr_pages, dinfo->p2m_size, dinfo->guest_width); + SET_FIELD(start_info, shared_info, shared_info_frame<guest_width); + SET_FIELD(start_info, flags, 0, dinfo->guest_width); + if ( GET_FIELD(start_info, store_mfn, dinfo->guest_width) > dinfo->p2m_size ) { ERROR("Suspend record xenstore frame number is bad"); munmap(start_info, PAGE_SIZE); goto out; } - *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn)]; - SET_FIELD(start_info, store_mfn, *store_mfn); - SET_FIELD(start_info, store_evtchn, store_evtchn); - if ( GET_FIELD(start_info, console.domU.mfn) > dinfo->p2m_size ) + *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn, dinfo->guest_width)]; + SET_FIELD(start_info, store_mfn, *store_mfn, dinfo->guest_width); + SET_FIELD(start_info, store_evtchn, store_evtchn, dinfo->guest_width); + if ( GET_FIELD(start_info, console.domU.mfn, dinfo->guest_width) > dinfo->p2m_size ) { ERROR("Suspend record console frame number is bad"); munmap(start_info, PAGE_SIZE); goto out; } - *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn)]; - SET_FIELD(start_info, console.domU.mfn, *console_mfn); - SET_FIELD(start_info, console.domU.evtchn, console_evtchn); + *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn, dinfo->guest_width)]; + SET_FIELD(start_info, console.domU.mfn, *console_mfn, dinfo->guest_width); + SET_FIELD(start_info, console.domU.evtchn, console_evtchn, dinfo->guest_width); munmap(start_info, PAGE_SIZE); } /* Uncanonicalise each GDT frame number. */ - if ( GET_FIELD(ctxt, gdt_ents) > 8192 ) + if ( GET_FIELD(ctxt, gdt_ents, dinfo->guest_width) > 8192 ) { ERROR("GDT entry count out of range"); goto out; } - for ( j = 0; (512*j) < GET_FIELD(ctxt, gdt_ents); j++ ) + for ( j = 0; (512*j) < GET_FIELD(ctxt, gdt_ents, dinfo->guest_width); j++ ) { - pfn = GET_FIELD(ctxt, gdt_frames[j]); + pfn = GET_FIELD(ctxt, gdt_frames[j], dinfo->guest_width); if ( (pfn >= dinfo->p2m_size) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) { @@ -2089,10 +2091,10 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, j, (unsigned long)pfn); goto out; } - SET_FIELD(ctxt, gdt_frames[j], ctx->p2m[pfn]); + SET_FIELD(ctxt, gdt_frames[j], ctx->p2m[pfn], dinfo->guest_width); } /* Uncanonicalise the page table base pointer. */ - pfn = UNFOLD_CR3(GET_FIELD(ctxt, ctrlreg[3])); + pfn = UNFOLD_CR3(GET_FIELD(ctxt, ctrlreg[3], dinfo->guest_width)); if ( pfn >= dinfo->p2m_size ) { @@ -2109,7 +2111,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, (unsigned long)ctx->pt_levels<p2m[pfn])); + SET_FIELD(ctxt, ctrlreg[3], FOLD_CR3(ctx->p2m[pfn]), dinfo->guest_width); /* Guest pagetable (x86/64) stored in otherwise-unused CR1. */ if ( (ctx->pt_levels == 4) && (ctxt->x64.ctrlreg[1] & 1) ) @@ -2199,16 +2201,16 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } /* restore saved vcpu_info and arch specific info */ - MEMCPY_FIELD(new_shared_info, old_shared_info, vcpu_info); - MEMCPY_FIELD(new_shared_info, old_shared_info, arch); + MEMCPY_FIELD(new_shared_info, old_shared_info, vcpu_info, dinfo->guest_width); + MEMCPY_FIELD(new_shared_info, old_shared_info, arch, dinfo->guest_width); /* clear any pending events and the selector */ - MEMSET_ARRAY_FIELD(new_shared_info, evtchn_pending, 0); + MEMSET_ARRAY_FIELD(new_shared_info, evtchn_pending, 0, dinfo->guest_width); for ( i = 0; i < XEN_LEGACY_MAX_VCPUS; i++ ) - SET_FIELD(new_shared_info, vcpu_info[i].evtchn_pending_sel, 0); + SET_FIELD(new_shared_info, vcpu_info[i].evtchn_pending_sel, 0, dinfo->guest_width); /* mask event channels */ - MEMSET_ARRAY_FIELD(new_shared_info, evtchn_mask, 0xff); + MEMSET_ARRAY_FIELD(new_shared_info, evtchn_mask, 0xff, dinfo->guest_width); /* leave wallclock time. set by hypervisor */ munmap(new_shared_info, PAGE_SIZE); diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index b5a772b..254fdb3 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -389,12 +389,12 @@ static void *map_frame_list_list(xc_interface *xch, uint32_t dom, int count = 100; void *p; struct domain_info_context *dinfo = &ctx->dinfo; - uint64_t fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list); + uint64_t fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list, dinfo->guest_width); while ( count-- && (fll == 0) ) { usleep(10000); - fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list); + fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list, dinfo->guest_width); } if ( fll == 0 ) @@ -1900,14 +1900,14 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter * reason==SHUTDOWN_suspend and is therefore found in the edx * register. */ - mfn = GET_FIELD(&ctxt, user_regs.edx); + mfn = GET_FIELD(&ctxt, user_regs.edx, dinfo->guest_width); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { errno = ERANGE; ERROR("Suspend record is not in range of pseudophys map"); goto out; } - SET_FIELD(&ctxt, user_regs.edx, mfn_to_pfn(mfn)); + SET_FIELD(&ctxt, user_regs.edx, mfn_to_pfn(mfn), dinfo->guest_width); for ( i = 0; i <= info.max_vcpu_id; i++ ) { @@ -1921,28 +1921,30 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Canonicalise each GDT frame number. */ - for ( j = 0; (512*j) < GET_FIELD(&ctxt, gdt_ents); j++ ) + for ( j = 0; (512*j) < GET_FIELD(&ctxt, gdt_ents, dinfo->guest_width); j++ ) { - mfn = GET_FIELD(&ctxt, gdt_frames[j]); + mfn = GET_FIELD(&ctxt, gdt_frames[j], dinfo->guest_width); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { errno = ERANGE; ERROR("GDT frame is not in range of pseudophys map"); goto out; } - SET_FIELD(&ctxt, gdt_frames[j], mfn_to_pfn(mfn)); + SET_FIELD(&ctxt, gdt_frames[j], mfn_to_pfn(mfn), dinfo->guest_width); } /* Canonicalise the page table base pointer. */ - if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3( - GET_FIELD(&ctxt, ctrlreg[3]))) ) + if ( !MFN_IS_IN_PSEUDOPHYS_MAP( + UNFOLD_CR3(GET_FIELD(&ctxt, ctrlreg[3], dinfo->guest_width))) ) { errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } SET_FIELD(&ctxt, ctrlreg[3], - FOLD_CR3(mfn_to_pfn(UNFOLD_CR3(GET_FIELD(&ctxt, ctrlreg[3]))))); + FOLD_CR3(mfn_to_pfn(UNFOLD_CR3( + GET_FIELD(&ctxt, ctrlreg[3], dinfo->guest_width) + ))), dinfo->guest_width); /* Guest pagetable (x86/64) stored in otherwise-unused CR1. */ if ( (ctx->pt_levels == 4) && ctxt.x64.ctrlreg[1] ) @@ -2051,7 +2053,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter */ memcpy(page, live_shinfo, PAGE_SIZE); SET_FIELD(((shared_info_any_t *)page), - arch.pfn_to_mfn_frame_list_list, 0); + arch.pfn_to_mfn_frame_list_list, 0, dinfo->guest_width); if ( wrexact(io_fd, page, PAGE_SIZE) ) { PERROR("Error when writing to state file (1)"); diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index f48515a..e67bebd 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -74,7 +74,7 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) if ( (rc = xc_vcpu_getcontext(xch, domid, 0, &ctxt)) != 0 ) return rc; - SET_FIELD(&ctxt, user_regs.eax, 1); + SET_FIELD(&ctxt, user_regs.eax, 1, dinfo->guest_width); if ( (rc = xc_vcpu_setcontext(xch, domid, 0, &ctxt)) != 0 ) return rc; @@ -202,7 +202,7 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) goto out; } - mfn = GET_FIELD(&ctxt, user_regs.edx); + mfn = GET_FIELD(&ctxt, user_regs.edx, dinfo->guest_width); start_info = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index 69ea64e..aa93c13 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -360,10 +360,10 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, #define is_mapped(pfn_type) (!((pfn_type) & 0x80000000UL)) -#define GET_FIELD(_p, _f) ((dinfo->guest_width==8) ? ((_p)->x64._f) : ((_p)->x32._f)) +#define GET_FIELD(_p, _f, _w) (((_w) == 8) ? ((_p)->x64._f) : ((_p)->x32._f)) -#define SET_FIELD(_p, _f, _v) do { \ - if (dinfo->guest_width == 8) \ +#define SET_FIELD(_p, _f, _v, _w) do { \ + if ((_w) == 8) \ (_p)->x64._f = (_v); \ else \ (_p)->x32._f = (_v); \ @@ -379,15 +379,15 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, ? ((uint64_t)(_c)) << 12 \ : (((uint32_t)(_c) << 12) | ((uint32_t)(_c) >> 20)))) -#define MEMCPY_FIELD(_d, _s, _f) do { \ - if (dinfo->guest_width == 8) \ +#define MEMCPY_FIELD(_d, _s, _f, _w) do { \ + if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ else \ memcpy(&(_d)->x32._f, &(_s)->x32._f,sizeof((_d)->x32._f)); \ } while (0) -#define MEMSET_ARRAY_FIELD(_p, _f, _v) do { \ - if (dinfo->guest_width == 8) \ +#define MEMSET_ARRAY_FIELD(_p, _f, _v, _w) do { \ + if ((_w) == 8) \ memset(&(_p)->x64._f[0], (_v), sizeof((_p)->x64._f)); \ else \ memset(&(_p)->x32._f[0], (_v), sizeof((_p)->x32._f)); \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:50:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAC-0001vj-Vd; Sat, 05 Jul 2014 16:50:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAB-0001va-Vp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:12 +0000 Received: from [193.109.254.147:55431] by server-6.bemta-14.messagelabs.com id AC/45-08262-3CC28B35; Sat, 05 Jul 2014 16:50:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1404579008!15686120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23883 invoked from network); 5 Jul 2014 16:50:09 -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; 5 Jul 2014 16:50:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TA8-0006H5-8y for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TA2-0002c3-QI for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:02 +0000 Date: Sat, 05 Jul 2014 16:50:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Improve the *_FIELD() 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 9f378f487a879f9a459f3719b82578c781a0adf8 Author: Andrew Cooper AuthorDate: Wed Jun 18 18:18:37 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 tools/libxc: Improve the *_FIELD() macros The {GET,SET,MEMCPY,MEMSET_ARRAY}_FIELD() macros previously required 'dinfo->guest_width' to exist in scope, which is somewhat antisocial, and makes them awkward to use in other contexts. Update these macros to take guest width as a parameter, and in all cases pass dinfo->guest_width. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 54 ++++++++++++++++++++------------------ tools/libxc/xc_domain_save.c | 24 +++++++++-------- tools/libxc/xc_resume.c | 4 +- tools/libxc/xg_save_restore.h | 14 +++++----- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b94887f..071ab6a 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -317,7 +317,7 @@ static xen_pfn_t *load_p2m_frame_list( tot_bytes -= chunk_bytes; chunk_bytes = 0; - if ( GET_FIELD(&ctxt, vm_assist) + if ( GET_FIELD(&ctxt, vm_assist, dinfo->guest_width) & (1UL << VMASST_TYPE_pae_extended_cr3) ) *pae_extended_cr3 = 1; } @@ -2018,7 +2018,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, DPRINTF("read VCPU %d\n", i); if ( !new_ctxt_format ) - SET_FIELD(ctxt, flags, GET_FIELD(ctxt, flags) | VGCF_online); + SET_FIELD(ctxt, flags, + GET_FIELD(ctxt, flags, dinfo->guest_width) | VGCF_online, + dinfo->guest_width); if ( i == 0 ) { @@ -2032,7 +2034,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, * xc_domain_save and therefore the PFN is found in the * edx register. */ - pfn = GET_FIELD(ctxt, user_regs.edx); + pfn = GET_FIELD(ctxt, user_regs.edx, dinfo->guest_width); if ( (pfn >= dinfo->p2m_size) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) { @@ -2040,7 +2042,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } mfn = ctx->p2m[pfn]; - SET_FIELD(ctxt, user_regs.edx, mfn); + SET_FIELD(ctxt, user_regs.edx, mfn, dinfo->guest_width); start_info = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); if ( start_info == NULL ) @@ -2049,39 +2051,39 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - SET_FIELD(start_info, nr_pages, dinfo->p2m_size); - SET_FIELD(start_info, shared_info, shared_info_frame< dinfo->p2m_size ) + SET_FIELD(start_info, nr_pages, dinfo->p2m_size, dinfo->guest_width); + SET_FIELD(start_info, shared_info, shared_info_frame<guest_width); + SET_FIELD(start_info, flags, 0, dinfo->guest_width); + if ( GET_FIELD(start_info, store_mfn, dinfo->guest_width) > dinfo->p2m_size ) { ERROR("Suspend record xenstore frame number is bad"); munmap(start_info, PAGE_SIZE); goto out; } - *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn)]; - SET_FIELD(start_info, store_mfn, *store_mfn); - SET_FIELD(start_info, store_evtchn, store_evtchn); - if ( GET_FIELD(start_info, console.domU.mfn) > dinfo->p2m_size ) + *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn, dinfo->guest_width)]; + SET_FIELD(start_info, store_mfn, *store_mfn, dinfo->guest_width); + SET_FIELD(start_info, store_evtchn, store_evtchn, dinfo->guest_width); + if ( GET_FIELD(start_info, console.domU.mfn, dinfo->guest_width) > dinfo->p2m_size ) { ERROR("Suspend record console frame number is bad"); munmap(start_info, PAGE_SIZE); goto out; } - *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn)]; - SET_FIELD(start_info, console.domU.mfn, *console_mfn); - SET_FIELD(start_info, console.domU.evtchn, console_evtchn); + *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn, dinfo->guest_width)]; + SET_FIELD(start_info, console.domU.mfn, *console_mfn, dinfo->guest_width); + SET_FIELD(start_info, console.domU.evtchn, console_evtchn, dinfo->guest_width); munmap(start_info, PAGE_SIZE); } /* Uncanonicalise each GDT frame number. */ - if ( GET_FIELD(ctxt, gdt_ents) > 8192 ) + if ( GET_FIELD(ctxt, gdt_ents, dinfo->guest_width) > 8192 ) { ERROR("GDT entry count out of range"); goto out; } - for ( j = 0; (512*j) < GET_FIELD(ctxt, gdt_ents); j++ ) + for ( j = 0; (512*j) < GET_FIELD(ctxt, gdt_ents, dinfo->guest_width); j++ ) { - pfn = GET_FIELD(ctxt, gdt_frames[j]); + pfn = GET_FIELD(ctxt, gdt_frames[j], dinfo->guest_width); if ( (pfn >= dinfo->p2m_size) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) ) { @@ -2089,10 +2091,10 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, j, (unsigned long)pfn); goto out; } - SET_FIELD(ctxt, gdt_frames[j], ctx->p2m[pfn]); + SET_FIELD(ctxt, gdt_frames[j], ctx->p2m[pfn], dinfo->guest_width); } /* Uncanonicalise the page table base pointer. */ - pfn = UNFOLD_CR3(GET_FIELD(ctxt, ctrlreg[3])); + pfn = UNFOLD_CR3(GET_FIELD(ctxt, ctrlreg[3], dinfo->guest_width)); if ( pfn >= dinfo->p2m_size ) { @@ -2109,7 +2111,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, (unsigned long)ctx->pt_levels<p2m[pfn])); + SET_FIELD(ctxt, ctrlreg[3], FOLD_CR3(ctx->p2m[pfn]), dinfo->guest_width); /* Guest pagetable (x86/64) stored in otherwise-unused CR1. */ if ( (ctx->pt_levels == 4) && (ctxt->x64.ctrlreg[1] & 1) ) @@ -2199,16 +2201,16 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } /* restore saved vcpu_info and arch specific info */ - MEMCPY_FIELD(new_shared_info, old_shared_info, vcpu_info); - MEMCPY_FIELD(new_shared_info, old_shared_info, arch); + MEMCPY_FIELD(new_shared_info, old_shared_info, vcpu_info, dinfo->guest_width); + MEMCPY_FIELD(new_shared_info, old_shared_info, arch, dinfo->guest_width); /* clear any pending events and the selector */ - MEMSET_ARRAY_FIELD(new_shared_info, evtchn_pending, 0); + MEMSET_ARRAY_FIELD(new_shared_info, evtchn_pending, 0, dinfo->guest_width); for ( i = 0; i < XEN_LEGACY_MAX_VCPUS; i++ ) - SET_FIELD(new_shared_info, vcpu_info[i].evtchn_pending_sel, 0); + SET_FIELD(new_shared_info, vcpu_info[i].evtchn_pending_sel, 0, dinfo->guest_width); /* mask event channels */ - MEMSET_ARRAY_FIELD(new_shared_info, evtchn_mask, 0xff); + MEMSET_ARRAY_FIELD(new_shared_info, evtchn_mask, 0xff, dinfo->guest_width); /* leave wallclock time. set by hypervisor */ munmap(new_shared_info, PAGE_SIZE); diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index b5a772b..254fdb3 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -389,12 +389,12 @@ static void *map_frame_list_list(xc_interface *xch, uint32_t dom, int count = 100; void *p; struct domain_info_context *dinfo = &ctx->dinfo; - uint64_t fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list); + uint64_t fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list, dinfo->guest_width); while ( count-- && (fll == 0) ) { usleep(10000); - fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list); + fll = GET_FIELD(shinfo, arch.pfn_to_mfn_frame_list_list, dinfo->guest_width); } if ( fll == 0 ) @@ -1900,14 +1900,14 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter * reason==SHUTDOWN_suspend and is therefore found in the edx * register. */ - mfn = GET_FIELD(&ctxt, user_regs.edx); + mfn = GET_FIELD(&ctxt, user_regs.edx, dinfo->guest_width); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { errno = ERANGE; ERROR("Suspend record is not in range of pseudophys map"); goto out; } - SET_FIELD(&ctxt, user_regs.edx, mfn_to_pfn(mfn)); + SET_FIELD(&ctxt, user_regs.edx, mfn_to_pfn(mfn), dinfo->guest_width); for ( i = 0; i <= info.max_vcpu_id; i++ ) { @@ -1921,28 +1921,30 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Canonicalise each GDT frame number. */ - for ( j = 0; (512*j) < GET_FIELD(&ctxt, gdt_ents); j++ ) + for ( j = 0; (512*j) < GET_FIELD(&ctxt, gdt_ents, dinfo->guest_width); j++ ) { - mfn = GET_FIELD(&ctxt, gdt_frames[j]); + mfn = GET_FIELD(&ctxt, gdt_frames[j], dinfo->guest_width); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { errno = ERANGE; ERROR("GDT frame is not in range of pseudophys map"); goto out; } - SET_FIELD(&ctxt, gdt_frames[j], mfn_to_pfn(mfn)); + SET_FIELD(&ctxt, gdt_frames[j], mfn_to_pfn(mfn), dinfo->guest_width); } /* Canonicalise the page table base pointer. */ - if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3( - GET_FIELD(&ctxt, ctrlreg[3]))) ) + if ( !MFN_IS_IN_PSEUDOPHYS_MAP( + UNFOLD_CR3(GET_FIELD(&ctxt, ctrlreg[3], dinfo->guest_width))) ) { errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } SET_FIELD(&ctxt, ctrlreg[3], - FOLD_CR3(mfn_to_pfn(UNFOLD_CR3(GET_FIELD(&ctxt, ctrlreg[3]))))); + FOLD_CR3(mfn_to_pfn(UNFOLD_CR3( + GET_FIELD(&ctxt, ctrlreg[3], dinfo->guest_width) + ))), dinfo->guest_width); /* Guest pagetable (x86/64) stored in otherwise-unused CR1. */ if ( (ctx->pt_levels == 4) && ctxt.x64.ctrlreg[1] ) @@ -2051,7 +2053,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter */ memcpy(page, live_shinfo, PAGE_SIZE); SET_FIELD(((shared_info_any_t *)page), - arch.pfn_to_mfn_frame_list_list, 0); + arch.pfn_to_mfn_frame_list_list, 0, dinfo->guest_width); if ( wrexact(io_fd, page, PAGE_SIZE) ) { PERROR("Error when writing to state file (1)"); diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index f48515a..e67bebd 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -74,7 +74,7 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) if ( (rc = xc_vcpu_getcontext(xch, domid, 0, &ctxt)) != 0 ) return rc; - SET_FIELD(&ctxt, user_regs.eax, 1); + SET_FIELD(&ctxt, user_regs.eax, 1, dinfo->guest_width); if ( (rc = xc_vcpu_setcontext(xch, domid, 0, &ctxt)) != 0 ) return rc; @@ -202,7 +202,7 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) goto out; } - mfn = GET_FIELD(&ctxt, user_regs.edx); + mfn = GET_FIELD(&ctxt, user_regs.edx, dinfo->guest_width); start_info = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index 69ea64e..aa93c13 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -360,10 +360,10 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, #define is_mapped(pfn_type) (!((pfn_type) & 0x80000000UL)) -#define GET_FIELD(_p, _f) ((dinfo->guest_width==8) ? ((_p)->x64._f) : ((_p)->x32._f)) +#define GET_FIELD(_p, _f, _w) (((_w) == 8) ? ((_p)->x64._f) : ((_p)->x32._f)) -#define SET_FIELD(_p, _f, _v) do { \ - if (dinfo->guest_width == 8) \ +#define SET_FIELD(_p, _f, _v, _w) do { \ + if ((_w) == 8) \ (_p)->x64._f = (_v); \ else \ (_p)->x32._f = (_v); \ @@ -379,15 +379,15 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, ? ((uint64_t)(_c)) << 12 \ : (((uint32_t)(_c) << 12) | ((uint32_t)(_c) >> 20)))) -#define MEMCPY_FIELD(_d, _s, _f) do { \ - if (dinfo->guest_width == 8) \ +#define MEMCPY_FIELD(_d, _s, _f, _w) do { \ + if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ else \ memcpy(&(_d)->x32._f, &(_s)->x32._f,sizeof((_d)->x32._f)); \ } while (0) -#define MEMSET_ARRAY_FIELD(_p, _f, _v) do { \ - if (dinfo->guest_width == 8) \ +#define MEMSET_ARRAY_FIELD(_p, _f, _v, _w) do { \ + if ((_w) == 8) \ memset(&(_p)->x64._f[0], (_v), sizeof((_p)->x64._f)); \ else \ memset(&(_p)->x32._f[0], (_v), sizeof((_p)->x32._f)); \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:50:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAN-0001xT-2C; Sat, 05 Jul 2014 16:50:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAL-0001xA-81 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:21 +0000 Received: from [85.158.143.35:52106] by server-1.bemta-4.messagelabs.com id 84/37-09496-CCC28B35; Sat, 05 Jul 2014 16:50:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404579018!15974520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31560 invoked from network); 5 Jul 2014 16:50:19 -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; 5 Jul 2014 16:50:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAI-0006HB-JU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAI-0002fd-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:18 +0000 Date: Sat, 05 Jul 2014 16:50:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Init traps very early X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea392432119c1dedefb448d4c053151da36c6e0 Author: Julien Grall AuthorDate: Thu Jun 19 15:02:16 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 xen/arm: Init traps very early The function init_traps sets up the handler taken when Xen hits a BUG_ON/ASSERT. If an error happen before init_traps is called, we lose the backtrace. When a trap is taken from HYP mode, we need to: - get the processor ID, percpu has to be initialized and the smp_processor_id correctly set. - initialize current, even though it's not used for the time being. Move the debug sanity earlier. Signed-off-by: Julien Grall Tested-by: Naresh Bhat Acked-by: Ian Campbell [ ijc -- fixed typos and rewrapped commit log ] --- xen/arch/arm/setup.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b9ce7a9..78dc7f5 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -670,6 +670,12 @@ void __init start_xen(unsigned long boot_phys_offset, percpu_init_areas(); set_processor_id(0); /* needed early, for smp_processor_id() */ + set_current((struct vcpu *)0xfffff000); /* debug sanity */ + idle_vcpu[0] = current; + + /* Initialize traps early allow us to get backtrace when an error occurred */ + init_traps(); + smp_clear_cpu_maps(); /* This is mapped by head.S */ @@ -706,11 +712,6 @@ void __init start_xen(unsigned long boot_phys_offset, gic_init(); - set_current((struct vcpu *)0xfffff000); /* debug sanity */ - idle_vcpu[0] = current; - - init_traps(); - setup_virt_paging(); p2m_vmid_allocator_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 Sat Jul 05 16:50:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAN-0001xT-2C; Sat, 05 Jul 2014 16:50:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAL-0001xA-81 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:21 +0000 Received: from [85.158.143.35:52106] by server-1.bemta-4.messagelabs.com id 84/37-09496-CCC28B35; Sat, 05 Jul 2014 16:50:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404579018!15974520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31560 invoked from network); 5 Jul 2014 16:50:19 -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; 5 Jul 2014 16:50:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAI-0006HB-JU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAI-0002fd-Gq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:18 +0000 Date: Sat, 05 Jul 2014 16:50:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Init traps very early X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea392432119c1dedefb448d4c053151da36c6e0 Author: Julien Grall AuthorDate: Thu Jun 19 15:02:16 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 xen/arm: Init traps very early The function init_traps sets up the handler taken when Xen hits a BUG_ON/ASSERT. If an error happen before init_traps is called, we lose the backtrace. When a trap is taken from HYP mode, we need to: - get the processor ID, percpu has to be initialized and the smp_processor_id correctly set. - initialize current, even though it's not used for the time being. Move the debug sanity earlier. Signed-off-by: Julien Grall Tested-by: Naresh Bhat Acked-by: Ian Campbell [ ijc -- fixed typos and rewrapped commit log ] --- xen/arch/arm/setup.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b9ce7a9..78dc7f5 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -670,6 +670,12 @@ void __init start_xen(unsigned long boot_phys_offset, percpu_init_areas(); set_processor_id(0); /* needed early, for smp_processor_id() */ + set_current((struct vcpu *)0xfffff000); /* debug sanity */ + idle_vcpu[0] = current; + + /* Initialize traps early allow us to get backtrace when an error occurred */ + init_traps(); + smp_clear_cpu_maps(); /* This is mapped by head.S */ @@ -706,11 +712,6 @@ void __init start_xen(unsigned long boot_phys_offset, gic_init(); - set_current((struct vcpu *)0xfffff000); /* debug sanity */ - idle_vcpu[0] = current; - - init_traps(); - setup_virt_paging(); p2m_vmid_allocator_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 Sat Jul 05 16:50:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAX-0001zA-6J; Sat, 05 Jul 2014 16:50:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAV-0001yl-JT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:31 +0000 Received: from [85.158.137.68:42265] by server-5.bemta-3.messagelabs.com id 25/A2-02401-6DC28B35; Sat, 05 Jul 2014 16:50:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579029!10497035!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31422 invoked from network); 5 Jul 2014 16:50:30 -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 Jul 2014 16:50:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAS-0006HJ-Q8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAS-0002iI-NQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:28 +0000 Date: Sat, 05 Jul 2014 16:50:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add some useful debug in coprocessor trapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42642dbd8511a8a3c2e70792a31d725b780a7744 Author: Julien Grall AuthorDate: Thu Jun 19 15:09:49 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 xen/arm: Add some useful debug in coprocessor trapping XSA-93 adds a couple of new functions to trap coprocessor registers. They unconditionally inject an undefined instruction to guest. When debugging an OS at early stage, it may be hard to know why the guest received an UNDEFINED. Add some debug message to help the developer when Xen is built in debug mode. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 20 ++++++++++++++++++++ xen/include/asm-arm/processor.h | 11 +++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 994b654..2fde0dd 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1546,23 +1546,43 @@ bad_cp: static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) { +#ifndef NDEBUG + struct hsr_cp64 cp64 = hsr.cp64; +#endif + if ( !check_conditional_instr(regs, hsr) ) { advance_pc(regs, hsr); return; } +#ifndef NDEBUG + gdprintk(XENLOG_ERR, + "%s p14, %d, r%d, r%d, cr%d @ 0x%"PRIregister"\n", + cp64.read ? "mrrc" : "mcrr", + cp64.op1, cp64.reg1, cp64.reg2, cp64.crm, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 access %#x\n", + hsr.bits & HSR_CP64_REGS_MASK); +#endif inject_undef32_exception(regs); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) { +#ifndef NDEBUG + struct hsr_cp cp = hsr.cp; +#endif + if ( !check_conditional_instr(regs, hsr) ) { advance_pc(regs, hsr); return; } +#ifndef NDEBUG + ASSERT(!cp.tas); /* We don't trap SIMD instruction */ + gdprintk(XENLOG_ERR, "unhandled CP%d access\n", cp.coproc); +#endif inject_undef32_exception(regs); } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index ebc683d..3be86f1 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -295,6 +295,17 @@ union hsr { unsigned long ec:6; /* Exception Class */ } cp64; /* HSR_EC_CP15_64, HSR_EC_CP14_64 */ + struct hsr_cp { + unsigned long coproc:4; /* Number of coproc accessed */ + unsigned long sbz0p:1; + unsigned long tas:1; /* Trapped Advanced SIMD */ + unsigned long res0:14; + unsigned long cc:4; /* Condition Code */ + unsigned long ccvalid:1;/* CC Valid */ + unsigned long len:1; /* Instruction length */ + unsigned long ec:6; /* Exception Class */ + } cp; /* HSR_EC_CP */ + #ifdef CONFIG_ARM_64 struct hsr_sysreg { unsigned long read:1; /* Direction */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:50:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAX-0001zA-6J; Sat, 05 Jul 2014 16:50:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAV-0001yl-JT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:31 +0000 Received: from [85.158.137.68:42265] by server-5.bemta-3.messagelabs.com id 25/A2-02401-6DC28B35; Sat, 05 Jul 2014 16:50:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579029!10497035!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31422 invoked from network); 5 Jul 2014 16:50:30 -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 Jul 2014 16:50:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAS-0006HJ-Q8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAS-0002iI-NQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:28 +0000 Date: Sat, 05 Jul 2014 16:50:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add some useful debug in coprocessor trapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42642dbd8511a8a3c2e70792a31d725b780a7744 Author: Julien Grall AuthorDate: Thu Jun 19 15:09:49 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 xen/arm: Add some useful debug in coprocessor trapping XSA-93 adds a couple of new functions to trap coprocessor registers. They unconditionally inject an undefined instruction to guest. When debugging an OS at early stage, it may be hard to know why the guest received an UNDEFINED. Add some debug message to help the developer when Xen is built in debug mode. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 20 ++++++++++++++++++++ xen/include/asm-arm/processor.h | 11 +++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 994b654..2fde0dd 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1546,23 +1546,43 @@ bad_cp: static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) { +#ifndef NDEBUG + struct hsr_cp64 cp64 = hsr.cp64; +#endif + if ( !check_conditional_instr(regs, hsr) ) { advance_pc(regs, hsr); return; } +#ifndef NDEBUG + gdprintk(XENLOG_ERR, + "%s p14, %d, r%d, r%d, cr%d @ 0x%"PRIregister"\n", + cp64.read ? "mrrc" : "mcrr", + cp64.op1, cp64.reg1, cp64.reg2, cp64.crm, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 access %#x\n", + hsr.bits & HSR_CP64_REGS_MASK); +#endif inject_undef32_exception(regs); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) { +#ifndef NDEBUG + struct hsr_cp cp = hsr.cp; +#endif + if ( !check_conditional_instr(regs, hsr) ) { advance_pc(regs, hsr); return; } +#ifndef NDEBUG + ASSERT(!cp.tas); /* We don't trap SIMD instruction */ + gdprintk(XENLOG_ERR, "unhandled CP%d access\n", cp.coproc); +#endif inject_undef32_exception(regs); } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index ebc683d..3be86f1 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -295,6 +295,17 @@ union hsr { unsigned long ec:6; /* Exception Class */ } cp64; /* HSR_EC_CP15_64, HSR_EC_CP14_64 */ + struct hsr_cp { + unsigned long coproc:4; /* Number of coproc accessed */ + unsigned long sbz0p:1; + unsigned long tas:1; /* Trapped Advanced SIMD */ + unsigned long res0:14; + unsigned long cc:4; /* Condition Code */ + unsigned long ccvalid:1;/* CC Valid */ + unsigned long len:1; /* Instruction length */ + unsigned long ec:6; /* Exception Class */ + } cp; /* HSR_EC_CP */ + #ifdef CONFIG_ARM_64 struct hsr_sysreg { unsigned long read:1; /* Direction */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:50:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAh-00020r-8z; Sat, 05 Jul 2014 16:50:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAf-00020b-NZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:41 +0000 Content-Length: 5473 Received: from [193.109.254.147:56239] by server-2.bemta-14.messagelabs.com id EF/E5-30377-0EC28B35; Sat, 05 Jul 2014 16:50:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1404579039!15654975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17179 invoked from network); 5 Jul 2014 16:50:40 -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; 5 Jul 2014 16:50:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAd-0006HX-0A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAc-0002iv-UG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:38 +0000 Date: Sat, 05 Jul 2014 16:50:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: set blktap2 availability on configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3833287277750627272==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3833287277750627272== Content-Length: 5184 Content-Transfer-Encoding: quoted-printable commit 653881ce41ec8db3ce7fad38dc280c165f027bb4 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:44 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 configure: set blktap2 availability on configure blktap2 will be enabled by default on Linux systems only, also give the oportunity to disable it from configure. Remove the gate in the Makefile that only allows enabling blktap{1,2} on Linux, since this is now done in a more flexible way on configure. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- config/Tools.mk.in | 1 + tools/Makefile | 5 +---- tools/config.h.in | 3 +++ tools/configure | 31 +++++++++++++++++++++++++++++++ tools/configure.ac | 18 ++++++++++++++++++ 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 84b2612..852c941 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -54,6 +54,7 @@ CONFIG_SEABIOS :=3D @seabios@ CONFIG_QEMU_TRAD :=3D @qemu_traditional@ CONFIG_QEMU_XEN :=3D @qemu_xen@ CONFIG_BLKTAP1 :=3D @blktap1@ +CONFIG_BLKTAP2 :=3D @blktap2@ CONFIG_VTPM :=3D @vtpm@ CONFIG_QEMUU_EXTRA_ARGS:=3D @EXTRA_QEMUU_CONFIGURE_ARGS@ diff --git a/tools/Makefile b/tools/Makefile index 63382b1..4682f43 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -16,11 +16,8 @@ SUBDIRS-y +=3D console SUBDIRS-y +=3D xenmon SUBDIRS-y +=3D xenstat SUBDIRS-$(CONFIG_Linux) +=3D memshr -ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy) SUBDIRS-$(CONFIG_BLKTAP1) +=3D blktap -endif -SUBDIRS-$(CONFIG_Linux) +=3D blktap2 -SUBDIRS-$(CONFIG_NetBSD) +=3D blktap2 +SUBDIRS-$(CONFIG_BLKTAP2) +=3D blktap2 SUBDIRS-$(CONFIG_NetBSD) +=3D xenbackendd SUBDIRS-y +=3D libfsimage SUBDIRS-$(CONFIG_Linux) +=3D libvchan diff --git a/tools/config.h.in b/tools/config.h.in index 028c360..40f3d1c 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Blktap2 enabled */ +#undef HAVE_BLKTAP2 + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H diff --git a/tools/configure b/tools/configure index c3a6824..d84d950 100755 --- a/tools/configure +++ b/tools/configure @@ -689,6 +689,7 @@ seabios_path qemu_xen rombios qemu_traditional +blktap2 blktap1 debug seabios @@ -763,6 +764,7 @@ enable_ovmf enable_seabios enable_debug enable_blktap1 +enable_blktap2 enable_qemu_traditional enable_rombios with_system_qemu @@ -1424,6 +1426,8 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) --enable-blktap1 Enable blktap1 tools (default is DISABLED) + --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise + off) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off) @@ -3724,6 +3728,33 @@ blktap1=3D$ax_cv_blktap1 +# Check whether --enable-blktap2 was given. +if test "${enable_blktap2+set}" =3D set; then : + enableval=3D$enable_blktap2; +else + + case "$host_os" in + linux*) + enable_blktap2=3D"yes";; + *) enable_blktap2=3D"no";; + esac + +fi + +if test "x$enable_blktap2" =3D "xyes"; then : + + +$as_echo "#define HAVE_BLKTAP2 1" >>confdefs.h + + blktap2=3Dy +else + + blktap2=3Dn + +fi + + + # Check whether --enable-qemu-traditional was given. if test "${enable_qemu_traditional+set}" =3D set; then : enableval=3D$enable_qemu_traditional; diff --git a/tools/configure.ac b/tools/configure.ac index 9db798b..836bbba 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -58,6 +58,24 @@ AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) +dnl Enable blktap2 on Linux only. +AC_ARG_ENABLE([blktap2], + AS_HELP_STRING([--enable-blktap2], + [Enable blktap2, (DEFAULT is on for Linux, otherwise off)]),,[ + case "$host_os" in + linux*) + enable_blktap2=3D"yes";; + *) enable_blktap2=3D"no";; + esac +]) +AS_IF([test "x$enable_blktap2" =3D "xyes"], [ +AC_DEFINE([HAVE_BLKTAP2], [1], [Blktap2 enabled]) + blktap2=3Dy],[ + blktap2=3Dn +]) +AC_SUBST(blktap2) + + AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], [Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off)]),,[ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3833287277750627272== 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 --===============3833287277750627272==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:50:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAh-00020r-8z; Sat, 05 Jul 2014 16:50:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAf-00020b-NZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:41 +0000 Content-Length: 5473 Received: from [193.109.254.147:56239] by server-2.bemta-14.messagelabs.com id EF/E5-30377-0EC28B35; Sat, 05 Jul 2014 16:50:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1404579039!15654975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17179 invoked from network); 5 Jul 2014 16:50:40 -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; 5 Jul 2014 16:50:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAd-0006HX-0A for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAc-0002iv-UG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:38 +0000 Date: Sat, 05 Jul 2014 16:50:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: set blktap2 availability on configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3833287277750627272==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3833287277750627272== Content-Length: 5184 Content-Transfer-Encoding: quoted-printable commit 653881ce41ec8db3ce7fad38dc280c165f027bb4 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:44 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:22 2014 +0100 configure: set blktap2 availability on configure blktap2 will be enabled by default on Linux systems only, also give the oportunity to disable it from configure. Remove the gate in the Makefile that only allows enabling blktap{1,2} on Linux, since this is now done in a more flexible way on configure. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- config/Tools.mk.in | 1 + tools/Makefile | 5 +---- tools/config.h.in | 3 +++ tools/configure | 31 +++++++++++++++++++++++++++++++ tools/configure.ac | 18 ++++++++++++++++++ 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 84b2612..852c941 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -54,6 +54,7 @@ CONFIG_SEABIOS :=3D @seabios@ CONFIG_QEMU_TRAD :=3D @qemu_traditional@ CONFIG_QEMU_XEN :=3D @qemu_xen@ CONFIG_BLKTAP1 :=3D @blktap1@ +CONFIG_BLKTAP2 :=3D @blktap2@ CONFIG_VTPM :=3D @vtpm@ CONFIG_QEMUU_EXTRA_ARGS:=3D @EXTRA_QEMUU_CONFIGURE_ARGS@ diff --git a/tools/Makefile b/tools/Makefile index 63382b1..4682f43 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -16,11 +16,8 @@ SUBDIRS-y +=3D console SUBDIRS-y +=3D xenmon SUBDIRS-y +=3D xenstat SUBDIRS-$(CONFIG_Linux) +=3D memshr -ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy) SUBDIRS-$(CONFIG_BLKTAP1) +=3D blktap -endif -SUBDIRS-$(CONFIG_Linux) +=3D blktap2 -SUBDIRS-$(CONFIG_NetBSD) +=3D blktap2 +SUBDIRS-$(CONFIG_BLKTAP2) +=3D blktap2 SUBDIRS-$(CONFIG_NetBSD) +=3D xenbackendd SUBDIRS-y +=3D libfsimage SUBDIRS-$(CONFIG_Linux) +=3D libvchan diff --git a/tools/config.h.in b/tools/config.h.in index 028c360..40f3d1c 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Blktap2 enabled */ +#undef HAVE_BLKTAP2 + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H diff --git a/tools/configure b/tools/configure index c3a6824..d84d950 100755 --- a/tools/configure +++ b/tools/configure @@ -689,6 +689,7 @@ seabios_path qemu_xen rombios qemu_traditional +blktap2 blktap1 debug seabios @@ -763,6 +764,7 @@ enable_ovmf enable_seabios enable_debug enable_blktap1 +enable_blktap2 enable_qemu_traditional enable_rombios with_system_qemu @@ -1424,6 +1426,8 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) --enable-blktap1 Enable blktap1 tools (default is DISABLED) + --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise + off) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off) @@ -3724,6 +3728,33 @@ blktap1=3D$ax_cv_blktap1 +# Check whether --enable-blktap2 was given. +if test "${enable_blktap2+set}" =3D set; then : + enableval=3D$enable_blktap2; +else + + case "$host_os" in + linux*) + enable_blktap2=3D"yes";; + *) enable_blktap2=3D"no";; + esac + +fi + +if test "x$enable_blktap2" =3D "xyes"; then : + + +$as_echo "#define HAVE_BLKTAP2 1" >>confdefs.h + + blktap2=3Dy +else + + blktap2=3Dn + +fi + + + # Check whether --enable-qemu-traditional was given. if test "${enable_qemu_traditional+set}" =3D set; then : enableval=3D$enable_qemu_traditional; diff --git a/tools/configure.ac b/tools/configure.ac index 9db798b..836bbba 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -58,6 +58,24 @@ AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) +dnl Enable blktap2 on Linux only. +AC_ARG_ENABLE([blktap2], + AS_HELP_STRING([--enable-blktap2], + [Enable blktap2, (DEFAULT is on for Linux, otherwise off)]),,[ + case "$host_os" in + linux*) + enable_blktap2=3D"yes";; + *) enable_blktap2=3D"no";; + esac +]) +AS_IF([test "x$enable_blktap2" =3D "xyes"], [ +AC_DEFINE([HAVE_BLKTAP2], [1], [Blktap2 enabled]) + blktap2=3Dy],[ + blktap2=3Dn +]) +AC_SUBST(blktap2) + + AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], [Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off)]),,[ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3833287277750627272== 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 --===============3833287277750627272==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:50:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAr-00022l-E8; Sat, 05 Jul 2014 16:50:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAp-00022Q-Mx for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:51 +0000 Content-Length: 2525 Received: from [193.109.254.147:26081] by server-8.bemta-14.messagelabs.com id D4/84-14857-BEC28B35; Sat, 05 Jul 2014 16:50:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1404579049!15658440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 5 Jul 2014 16:50:50 -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 Jul 2014 16:50:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAn-0006Hd-6L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAn-0002jI-4C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:49 +0000 Date: Sat, 05 Jul 2014 16:50:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: make the libaio test conditional on blktap{1, 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: multipart/mixed; boundary="===============6979965679977103691==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6979965679977103691== Content-Length: 2132 Content-Transfer-Encoding: quoted-printable commit 5a88f7033e354314a5935c583aabd2ffbd4504a2 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:45 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 configure: make the libaio test conditional on blktap{1, 2} libaio is only required for blktap{1,2}, so make the check conditional on whether the user has requested blktap{1,2} or not. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- tools/configure | 4 ++++ tools/configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/configure b/tools/configure index d84d950..eebe745 100755 --- a/tools/configure +++ b/tools/configure @@ -7535,6 +7535,8 @@ fi +if test "x$enable_blktap1" =3D "xyes" || test "x$enable_blktap2" =3D "xyes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } if ${ac_cv_lib_aio_io_setup+:} false; then : @@ -7583,6 +7585,8 @@ else fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_MD5+:} false; then : diff --git a/tools/configure.ac b/tools/configure.ac index 836bbba..6d70f04 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -262,7 +262,9 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib=3D"$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) +AS_IF([test "x$enable_blktap1" =3D "xyes" || test "x$enable_blktap2" =3D "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) +]) AC_SUBST(system_aio) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AX_CHECK_EXTFS -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6979965679977103691== 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 --===============6979965679977103691==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:50:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:50: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 1X3TAr-00022l-E8; Sat, 05 Jul 2014 16:50:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAp-00022Q-Mx for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:51 +0000 Content-Length: 2525 Received: from [193.109.254.147:26081] by server-8.bemta-14.messagelabs.com id D4/84-14857-BEC28B35; Sat, 05 Jul 2014 16:50:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1404579049!15658440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 5 Jul 2014 16:50:50 -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 Jul 2014 16:50:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAn-0006Hd-6L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAn-0002jI-4C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:49 +0000 Date: Sat, 05 Jul 2014 16:50:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: make the libaio test conditional on blktap{1, 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: multipart/mixed; boundary="===============6979965679977103691==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6979965679977103691== Content-Length: 2132 Content-Transfer-Encoding: quoted-printable commit 5a88f7033e354314a5935c583aabd2ffbd4504a2 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:45 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 configure: make the libaio test conditional on blktap{1, 2} libaio is only required for blktap{1,2}, so make the check conditional on whether the user has requested blktap{1,2} or not. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- tools/configure | 4 ++++ tools/configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/configure b/tools/configure index d84d950..eebe745 100755 --- a/tools/configure +++ b/tools/configure @@ -7535,6 +7535,8 @@ fi +if test "x$enable_blktap1" =3D "xyes" || test "x$enable_blktap2" =3D "xyes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } if ${ac_cv_lib_aio_io_setup+:} false; then : @@ -7583,6 +7585,8 @@ else fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_MD5+:} false; then : diff --git a/tools/configure.ac b/tools/configure.ac index 836bbba..6d70f04 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -262,7 +262,9 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib=3D"$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) +AS_IF([test "x$enable_blktap1" =3D "xyes" || test "x$enable_blktap2" =3D "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) +]) AC_SUBST(system_aio) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AX_CHECK_EXTFS -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6979965679977103691== 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 --===============6979965679977103691==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:51:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TB2-00024Y-H3; Sat, 05 Jul 2014 16:51:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAz-00024A-Qq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:02 +0000 Received: from [85.158.143.35:3137] by server-2.bemta-4.messagelabs.com id 43/0B-18579-5FC28B35; Sat, 05 Jul 2014 16:51:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404579059!15974578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1593 invoked from network); 5 Jul 2014 16:51:00 -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; 5 Jul 2014 16:51:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAx-0006Hm-BZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAx-0002je-9p for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:59 +0000 Date: Sat, 05 Jul 2014 16:50:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove the gate that only allows block or regular backing images X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1892871628636897915==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1892871628636897915== Content-Type: text/plain commit ebbcc0bf0f052e70de2e6d68731dd3224eed4bbe Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:47 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 libxl: remove the gate that only allows block or regular backing images On FreeBSD ZVOLs/disks/partitions are char devices, so libxl must allow it's usage. This is already taken care in the OS-specific bits of libxl by libxl__try_phy_backend, so remove the generic gate. Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 788895b..f8a2e1b 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -265,12 +265,6 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { disk->vdev, disk->pdev_path); return ERROR_INVAL; } - if (!S_ISBLK(a.stab.st_mode) & - !S_ISREG(a.stab.st_mode)) { - LOG(ERROR, "Disk vdev=%s phys path is not a block dev or file: %s", - disk->vdev, disk->pdev_path); - return ERROR_INVAL; - } } if (disk->backend != LIBXL_DISK_BACKEND_UNKNOWN) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1892871628636897915== 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 --===============1892871628636897915==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:51:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TB2-00024Y-H3; Sat, 05 Jul 2014 16:51:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAz-00024A-Qq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:02 +0000 Received: from [85.158.143.35:3137] by server-2.bemta-4.messagelabs.com id 43/0B-18579-5FC28B35; Sat, 05 Jul 2014 16:51:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1404579059!15974578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1593 invoked from network); 5 Jul 2014 16:51:00 -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; 5 Jul 2014 16:51:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TAx-0006Hm-BZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TAx-0002je-9p for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:50:59 +0000 Date: Sat, 05 Jul 2014 16:50:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove the gate that only allows block or regular backing images X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1892871628636897915==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1892871628636897915== Content-Type: text/plain commit ebbcc0bf0f052e70de2e6d68731dd3224eed4bbe Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:47 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 libxl: remove the gate that only allows block or regular backing images On FreeBSD ZVOLs/disks/partitions are char devices, so libxl must allow it's usage. This is already taken care in the OS-specific bits of libxl by libxl__try_phy_backend, so remove the generic gate. Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 788895b..f8a2e1b 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -265,12 +265,6 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { disk->vdev, disk->pdev_path); return ERROR_INVAL; } - if (!S_ISBLK(a.stab.st_mode) & - !S_ISREG(a.stab.st_mode)) { - LOG(ERROR, "Disk vdev=%s phys path is not a block dev or file: %s", - disk->vdev, disk->pdev_path); - return ERROR_INVAL; - } } if (disk->backend != LIBXL_DISK_BACKEND_UNKNOWN) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1892871628636897915== 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 --===============1892871628636897915==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:51:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBB-000266-LQ; Sat, 05 Jul 2014 16:51:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBA-00025o-3a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:12 +0000 Received: from [85.158.143.35:3531] by server-2.bemta-4.messagelabs.com id 72/1B-18579-FFC28B35; Sat, 05 Jul 2014 16:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1404579069!15720124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29284 invoked from network); 5 Jul 2014 16:51:10 -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; 5 Jul 2014 16:51:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TB7-0006IL-Gs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TB7-0002kw-Et for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:09 +0000 Date: Sat, 05 Jul 2014 16:51:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix printf formatting error surfaced by 66f8c6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7661686166929873306==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7661686166929873306== Content-Type: text/plain commit 2f5c3c90085030fe0d8a8b195b6c228a722f0c75 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:48 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 libxc: fix printf formatting error surfaced by 66f8c6 The privcmd hypercall op and arguments on BSDs are unsigned long, so use the proper printf format especifiers. Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxc/xenctrl_osdep_ENOSYS.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xenctrl_osdep_ENOSYS.c b/tools/libxc/xenctrl_osdep_ENOSYS.c index abdf3d5..dd59dcd 100644 --- a/tools/libxc/xenctrl_osdep_ENOSYS.c +++ b/tools/libxc/xenctrl_osdep_ENOSYS.c @@ -27,7 +27,11 @@ static int ENOSYS_privcmd_close(xc_interface *xch, xc_osdep_handle h) static int ENOSYS_privcmd_hypercall(xc_interface *xch, xc_osdep_handle h, privcmd_hypercall_t *hypercall) { +#if defined(__FreeBSD__) || defined(__NetBSD__) + IPRINTF(xch, "ENOSYS_privcmd %lx: hypercall: %02lu(%#lx,%#lx,%#lx,%#lx,%#lx)\n", +#else IPRINTF(xch, "ENOSYS_privcmd %lx: hypercall: %02lld(%#llx,%#llx,%#llx,%#llx,%#llx)\n", +#endif h, hypercall->op, hypercall->arg[0], hypercall->arg[1], hypercall->arg[2], hypercall->arg[3], hypercall->arg[4]); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7661686166929873306== 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 --===============7661686166929873306==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:51:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBB-000266-LQ; Sat, 05 Jul 2014 16:51:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBA-00025o-3a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:12 +0000 Received: from [85.158.143.35:3531] by server-2.bemta-4.messagelabs.com id 72/1B-18579-FFC28B35; Sat, 05 Jul 2014 16:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1404579069!15720124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29284 invoked from network); 5 Jul 2014 16:51:10 -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; 5 Jul 2014 16:51:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TB7-0006IL-Gs for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TB7-0002kw-Et for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:09 +0000 Date: Sat, 05 Jul 2014 16:51:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix printf formatting error surfaced by 66f8c6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7661686166929873306==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7661686166929873306== Content-Type: text/plain commit 2f5c3c90085030fe0d8a8b195b6c228a722f0c75 Author: Roger Pau Monne AuthorDate: Thu Jun 19 18:32:48 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 libxc: fix printf formatting error surfaced by 66f8c6 The privcmd hypercall op and arguments on BSDs are unsigned long, so use the proper printf format especifiers. Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxc/xenctrl_osdep_ENOSYS.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xenctrl_osdep_ENOSYS.c b/tools/libxc/xenctrl_osdep_ENOSYS.c index abdf3d5..dd59dcd 100644 --- a/tools/libxc/xenctrl_osdep_ENOSYS.c +++ b/tools/libxc/xenctrl_osdep_ENOSYS.c @@ -27,7 +27,11 @@ static int ENOSYS_privcmd_close(xc_interface *xch, xc_osdep_handle h) static int ENOSYS_privcmd_hypercall(xc_interface *xch, xc_osdep_handle h, privcmd_hypercall_t *hypercall) { +#if defined(__FreeBSD__) || defined(__NetBSD__) + IPRINTF(xch, "ENOSYS_privcmd %lx: hypercall: %02lu(%#lx,%#lx,%#lx,%#lx,%#lx)\n", +#else IPRINTF(xch, "ENOSYS_privcmd %lx: hypercall: %02lld(%#llx,%#llx,%#llx,%#llx,%#llx)\n", +#endif h, hypercall->op, hypercall->arg[0], hypercall->arg[1], hypercall->arg[2], hypercall->arg[3], hypercall->arg[4]); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7661686166929873306== 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 --===============7661686166929873306==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:51:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBL-00027p-O9; Sat, 05 Jul 2014 16:51:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBL-00027b-0P for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:23 +0000 Received: from [85.158.137.68:15012] by server-1.bemta-3.messagelabs.com id F7/38-13056-A0D28B35; Sat, 05 Jul 2014 16:51:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404579079!14166631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17038 invoked from network); 5 Jul 2014 16:51:20 -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; 5 Jul 2014 16:51:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBH-0006IR-MK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBH-0002lI-KK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:19 +0000 Date: Sat, 05 Jul 2014 16:51:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: remove extra newlines from xen-mceinj 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 255bd21d187c2db0c7e8b798f5ebf21e0be5548b Author: David Vrabel AuthorDate: Mon Jun 23 18:56:57 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: remove extra newlines from xen-mceinj error message err() calls perror() which appends a newline. Make Lprintf() also append a newline so err() and Lprintf() are consistent. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 85 +++++++++++++++---------------- 1 files changed, 42 insertions(+), 43 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 21a488b..7030bb2 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -94,7 +94,7 @@ static void Lprintf(const char *fmt, ...) va_start(args, fmt); if (vasprintf(&buf, fmt, args) < 0) abort(); - fprintf(LOGFILE, "%s", buf); + fprintf(LOGFILE, "%s\n", buf); va_end(args); free(buf); } @@ -156,7 +156,7 @@ static int inject_cmci(xc_interface *xc_handle, int cpu_nr) nr_cpus = mca_cpuinfo(xc_handle); if (!nr_cpus) - err(xc_handle, "Failed to get mca_cpuinfo\n"); + err(xc_handle, "Failed to get mca_cpuinfo"); mc.cmd = XEN_MC_inject_v2; mc.interface_version = XEN_MCA_INTERFACE_VERSION; @@ -273,32 +273,32 @@ static uint64_t guest_mfn(xc_interface *xc_handle, max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, sizeof(domain)) + 1; if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn); + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - Lprintf("Maxium gpfn for dom %d is 0x%lx\n", domain, max_gpfn); + Lprintf("Maxium gpfn for dom %d is 0x%lx", domain, max_gpfn); /* Get max mfn */ if ( !get_platform_info(xc_handle, domain, &max_mfn, &hvirt_start, &pt_levels, &guest_width) ) - err(xc_handle, "Failed to get platform information\n"); + err(xc_handle, "Failed to get platform information"); /* Get guest's pfn list */ pfn_buf = malloc(sizeof(uint64_t) * max_gpfn); if ( !pfn_buf ) - err(xc_handle, "Failed to alloc pfn buf\n"); + err(xc_handle, "Failed to alloc pfn buf"); memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn); ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); if ( ret < 0 ) { free(pfn_buf); - err(xc_handle, "Failed to get pfn list %x\n", ret); + err(xc_handle, "Failed to get pfn list %x", ret); } /* Now get the m2p table */ live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0); if ( !live_m2p ) - err(xc_handle, "Failed to map live M2P table\n"); + err(xc_handle, "Failed to map live M2P table"); /* match the mapping */ for ( i = 0; i < max_gpfn; i++ ) @@ -309,7 +309,7 @@ static uint64_t guest_mfn(xc_interface *xc_handle, if (mfn_valid(tmp) && (mfn_to_pfn(tmp) == gpfn)) { mfn = tmp; - Lprintf("We get the mfn 0x%lx for this injection\n", mfn); + Lprintf("We get the mfn 0x%lx for this injection", mfn); break; } } @@ -334,7 +334,7 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, sizeof(domain)) + 1; if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn); + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); index = gfn % max_gpfn; return guest_mfn(xc_handle, domain, index); @@ -385,33 +385,33 @@ static int inject_llc_srao(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_mce(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -426,33 +426,33 @@ static int inject_mem_srao(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_mce(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -467,33 +467,33 @@ static int inject_llc_ucna(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_cmci(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -569,7 +569,7 @@ int main(int argc, char *argv[]) init_msr_inj(); xc_handle = xc_interface_open(0, 0, 0); if ( !xc_handle ) { - Lprintf("Failed to get xc interface\n"); + Lprintf("Failed to get xc interface"); exit(EXIT_FAILURE); } @@ -584,17 +584,17 @@ int main(int argc, char *argv[]) case 'c': cpu_nr = strtol(optarg, &optarg, 10); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input a digit parameter for CPU\n"); + err(xc_handle, "Please input a digit parameter for CPU"); break; case 'd': domid = strtol(optarg, &optarg, 10); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input a digit parameter for domain\n"); + err(xc_handle, "Please input a digit parameter for domain"); break; case 'p': gaddr = strtol(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input correct page address\n"); + err(xc_handle, "Please input correct page address"); break; case 't': type = strtol(optarg, NULL, 0); @@ -608,23 +608,22 @@ int main(int argc, char *argv[]) if ( domid != DOMID_XEN ) { max_gpa = xs_get_dom_mem(domid); - Lprintf("get domain %d max gpa is: 0x%lx \n", domid, max_gpa); + Lprintf("get domain %d max gpa is: 0x%lx", domid, max_gpa); if ( gaddr >= max_gpa ) - err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx\n", max_gpa); + err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx", max_gpa); } - Lprintf("get gaddr of error inject is: 0x%lx \n", gaddr); + Lprintf("get gaddr of error inject is: 0x%lx", gaddr); if ( dump ) { gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) - Lprintf("Xen: mfn=0x%lx, haddr=0x%lx\n", mfn, haddr); + Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); else - Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx," - "mfn=0x%lx, haddr=0x%lx\n", + Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", domid, gaddr, gpfn, mfn, haddr); goto out; } @@ -641,7 +640,7 @@ int main(int argc, char *argv[]) inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); break; default: - err(xc_handle, "Unsupported error type\n"); + err(xc_handle, "Unsupported error type"); 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 Sat Jul 05 16:51:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBL-00027p-O9; Sat, 05 Jul 2014 16:51:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBL-00027b-0P for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:23 +0000 Received: from [85.158.137.68:15012] by server-1.bemta-3.messagelabs.com id F7/38-13056-A0D28B35; Sat, 05 Jul 2014 16:51:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404579079!14166631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17038 invoked from network); 5 Jul 2014 16:51:20 -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; 5 Jul 2014 16:51:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBH-0006IR-MK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBH-0002lI-KK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:19 +0000 Date: Sat, 05 Jul 2014 16:51:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: remove extra newlines from xen-mceinj 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 255bd21d187c2db0c7e8b798f5ebf21e0be5548b Author: David Vrabel AuthorDate: Mon Jun 23 18:56:57 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: remove extra newlines from xen-mceinj error message err() calls perror() which appends a newline. Make Lprintf() also append a newline so err() and Lprintf() are consistent. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 85 +++++++++++++++---------------- 1 files changed, 42 insertions(+), 43 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 21a488b..7030bb2 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -94,7 +94,7 @@ static void Lprintf(const char *fmt, ...) va_start(args, fmt); if (vasprintf(&buf, fmt, args) < 0) abort(); - fprintf(LOGFILE, "%s", buf); + fprintf(LOGFILE, "%s\n", buf); va_end(args); free(buf); } @@ -156,7 +156,7 @@ static int inject_cmci(xc_interface *xc_handle, int cpu_nr) nr_cpus = mca_cpuinfo(xc_handle); if (!nr_cpus) - err(xc_handle, "Failed to get mca_cpuinfo\n"); + err(xc_handle, "Failed to get mca_cpuinfo"); mc.cmd = XEN_MC_inject_v2; mc.interface_version = XEN_MCA_INTERFACE_VERSION; @@ -273,32 +273,32 @@ static uint64_t guest_mfn(xc_interface *xc_handle, max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, sizeof(domain)) + 1; if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn); + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - Lprintf("Maxium gpfn for dom %d is 0x%lx\n", domain, max_gpfn); + Lprintf("Maxium gpfn for dom %d is 0x%lx", domain, max_gpfn); /* Get max mfn */ if ( !get_platform_info(xc_handle, domain, &max_mfn, &hvirt_start, &pt_levels, &guest_width) ) - err(xc_handle, "Failed to get platform information\n"); + err(xc_handle, "Failed to get platform information"); /* Get guest's pfn list */ pfn_buf = malloc(sizeof(uint64_t) * max_gpfn); if ( !pfn_buf ) - err(xc_handle, "Failed to alloc pfn buf\n"); + err(xc_handle, "Failed to alloc pfn buf"); memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn); ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); if ( ret < 0 ) { free(pfn_buf); - err(xc_handle, "Failed to get pfn list %x\n", ret); + err(xc_handle, "Failed to get pfn list %x", ret); } /* Now get the m2p table */ live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0); if ( !live_m2p ) - err(xc_handle, "Failed to map live M2P table\n"); + err(xc_handle, "Failed to map live M2P table"); /* match the mapping */ for ( i = 0; i < max_gpfn; i++ ) @@ -309,7 +309,7 @@ static uint64_t guest_mfn(xc_interface *xc_handle, if (mfn_valid(tmp) && (mfn_to_pfn(tmp) == gpfn)) { mfn = tmp; - Lprintf("We get the mfn 0x%lx for this injection\n", mfn); + Lprintf("We get the mfn 0x%lx for this injection", mfn); break; } } @@ -334,7 +334,7 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, sizeof(domain)) + 1; if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn); + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); index = gfn % max_gpfn; return guest_mfn(xc_handle, domain, index); @@ -385,33 +385,33 @@ static int inject_llc_srao(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_mce(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -426,33 +426,33 @@ static int inject_mem_srao(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_mce(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -467,33 +467,33 @@ static int inject_llc_ucna(xc_interface *xc_handle, ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + err(xc_handle, "Failed to inject MCi_MISC MSR"); gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr); if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) - err(xc_handle, "Failed to inject MSR\n"); + err(xc_handle, "Failed to inject MSR"); ret = inject_cmci(xc_handle, cpu_nr); if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + err(xc_handle, "Failed to inject MCE error"); return 0; } @@ -569,7 +569,7 @@ int main(int argc, char *argv[]) init_msr_inj(); xc_handle = xc_interface_open(0, 0, 0); if ( !xc_handle ) { - Lprintf("Failed to get xc interface\n"); + Lprintf("Failed to get xc interface"); exit(EXIT_FAILURE); } @@ -584,17 +584,17 @@ int main(int argc, char *argv[]) case 'c': cpu_nr = strtol(optarg, &optarg, 10); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input a digit parameter for CPU\n"); + err(xc_handle, "Please input a digit parameter for CPU"); break; case 'd': domid = strtol(optarg, &optarg, 10); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input a digit parameter for domain\n"); + err(xc_handle, "Please input a digit parameter for domain"); break; case 'p': gaddr = strtol(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) - err(xc_handle, "Please input correct page address\n"); + err(xc_handle, "Please input correct page address"); break; case 't': type = strtol(optarg, NULL, 0); @@ -608,23 +608,22 @@ int main(int argc, char *argv[]) if ( domid != DOMID_XEN ) { max_gpa = xs_get_dom_mem(domid); - Lprintf("get domain %d max gpa is: 0x%lx \n", domid, max_gpa); + Lprintf("get domain %d max gpa is: 0x%lx", domid, max_gpa); if ( gaddr >= max_gpa ) - err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx\n", max_gpa); + err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx", max_gpa); } - Lprintf("get gaddr of error inject is: 0x%lx \n", gaddr); + Lprintf("get gaddr of error inject is: 0x%lx", gaddr); if ( dump ) { gpfn = gaddr >> PAGE_SHIFT; mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn); if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid\n"); + err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) - Lprintf("Xen: mfn=0x%lx, haddr=0x%lx\n", mfn, haddr); + Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); else - Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx," - "mfn=0x%lx, haddr=0x%lx\n", + Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", domid, gaddr, gpfn, mfn, haddr); goto out; } @@ -641,7 +640,7 @@ int main(int argc, char *argv[]) inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); break; default: - err(xc_handle, "Unsupported error type\n"); + err(xc_handle, "Unsupported error type"); 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 Sat Jul 05 16:51:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBU-00029L-Qq; Sat, 05 Jul 2014 16:51:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBU-00029B-B0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:32 +0000 Received: from [193.109.254.147:27029] by server-4.bemta-14.messagelabs.com id 57/77-20586-31D28B35; Sat, 05 Jul 2014 16:51:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1404579090!15597392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16057 invoked from network); 5 Jul 2014 16:51:30 -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; 5 Jul 2014 16:51:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBR-0006IZ-RY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBR-0002lf-Pj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:29 +0000 Date: Sat, 05 Jul 2014 16:51:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: clarify xen-mceinj 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 6abc1385c7b03f0fcf75a96f153e6972c7cec184 Author: David Vrabel AuthorDate: Mon Jun 23 18:56:58 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: clarify xen-mceinj usage Correctly name --page option and make it clear that it takes a parameter. Use consistent formatting for help message. Remove unused options. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 7030bb2..51ca175 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -528,7 +528,6 @@ static struct option opts[] = { {"domain", 0, 0, 'd'}, {"dump", 0, 0, 'D'}, {"help", 0, 0, 'h'}, - {"log", 0, 0, 'l'}, {"page", 0, 0, 'p'}, {"", 0, 0, '\0'} }; @@ -540,11 +539,11 @@ static void help(void) "Mandatory arguments to long options are mandatory" "for short options too.\n" " -D, --dump dump addr info without error injection\n" - " -c, --cpu=CPU_ID target CPU\n" - " -d, --domain=DomID target domain, the default is Xen itself\n" + " -c, --cpu=CPU target CPU\n" + " -d, --domain=DOMID target domain, the default is Xen itself\n" " -h, --help print this page\n" - " -p, --phyaddr physical address\n" - " -t, --type=error error type\n" + " -p, --page=ADDR physical address to report\n" + " -t, --type=ERROR error type\n" " 0 : MCE_SRAO_MEM\n" " 1 : MCE_SRAO_LLC\n" " 2 : CMCI_UCNA_LLC\n" @@ -574,7 +573,7 @@ int main(int argc, char *argv[]) } while ( 1 ) { - c = getopt_long(argc, argv, "c:Dd:t:hp:r", opts, &opt_index); + c = getopt_long(argc, argv, "c:Dd:t:hp:", opts, &opt_index); if ( c == -1 ) break; switch ( 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 Jul 05 16:51:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBU-00029L-Qq; Sat, 05 Jul 2014 16:51:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBU-00029B-B0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:32 +0000 Received: from [193.109.254.147:27029] by server-4.bemta-14.messagelabs.com id 57/77-20586-31D28B35; Sat, 05 Jul 2014 16:51:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1404579090!15597392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16057 invoked from network); 5 Jul 2014 16:51:30 -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; 5 Jul 2014 16:51:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBR-0006IZ-RY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBR-0002lf-Pj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:29 +0000 Date: Sat, 05 Jul 2014 16:51:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: clarify xen-mceinj 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 6abc1385c7b03f0fcf75a96f153e6972c7cec184 Author: David Vrabel AuthorDate: Mon Jun 23 18:56:58 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: clarify xen-mceinj usage Correctly name --page option and make it clear that it takes a parameter. Use consistent formatting for help message. Remove unused options. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 7030bb2..51ca175 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -528,7 +528,6 @@ static struct option opts[] = { {"domain", 0, 0, 'd'}, {"dump", 0, 0, 'D'}, {"help", 0, 0, 'h'}, - {"log", 0, 0, 'l'}, {"page", 0, 0, 'p'}, {"", 0, 0, '\0'} }; @@ -540,11 +539,11 @@ static void help(void) "Mandatory arguments to long options are mandatory" "for short options too.\n" " -D, --dump dump addr info without error injection\n" - " -c, --cpu=CPU_ID target CPU\n" - " -d, --domain=DomID target domain, the default is Xen itself\n" + " -c, --cpu=CPU target CPU\n" + " -d, --domain=DOMID target domain, the default is Xen itself\n" " -h, --help print this page\n" - " -p, --phyaddr physical address\n" - " -t, --type=error error type\n" + " -p, --page=ADDR physical address to report\n" + " -t, --type=ERROR error type\n" " 0 : MCE_SRAO_MEM\n" " 1 : MCE_SRAO_LLC\n" " 2 : CMCI_UCNA_LLC\n" @@ -574,7 +573,7 @@ int main(int argc, char *argv[]) } while ( 1 ) { - c = getopt_long(argc, argv, "c:Dd:t:hp:r", opts, &opt_index); + c = getopt_long(argc, argv, "c:Dd:t:hp:", opts, &opt_index); if ( c == -1 ) break; switch ( 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 Jul 05 16:51:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBf-0002BP-TW; Sat, 05 Jul 2014 16:51:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBe-0002B6-IQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:42 +0000 Received: from [85.158.139.211:62503] by server-17.bemta-5.messagelabs.com id 00/E9-08711-D1D28B35; Sat, 05 Jul 2014 16:51:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1404579100!10923307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29101 invoked from network); 5 Jul 2014 16:51:41 -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; 5 Jul 2014 16:51:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBc-0006If-0k for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBb-0002m5-VW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:39 +0000 Date: Sat, 05 Jul 2014 16:51:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: use calloc() instead of malloc()/memset() in xen-mceinj X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecc7647b37b179465244add2468552a33025f14d Author: David Vrabel AuthorDate: Mon Jun 23 18:56:59 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: use calloc() instead of malloc()/memset() in xen-mceinj Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 51ca175..d4f889b 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -284,10 +284,9 @@ static uint64_t guest_mfn(xc_interface *xc_handle, err(xc_handle, "Failed to get platform information"); /* Get guest's pfn list */ - pfn_buf = malloc(sizeof(uint64_t) * max_gpfn); + pfn_buf = calloc(max_gpfn, sizeof(uint64_t)); if ( !pfn_buf ) err(xc_handle, "Failed to alloc pfn buf"); - memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn); ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); if ( ret < 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 Jul 05 16:51:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBf-0002BP-TW; Sat, 05 Jul 2014 16:51:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBe-0002B6-IQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:42 +0000 Received: from [85.158.139.211:62503] by server-17.bemta-5.messagelabs.com id 00/E9-08711-D1D28B35; Sat, 05 Jul 2014 16:51:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1404579100!10923307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29101 invoked from network); 5 Jul 2014 16:51:41 -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; 5 Jul 2014 16:51:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBc-0006If-0k for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBb-0002m5-VW for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:39 +0000 Date: Sat, 05 Jul 2014 16:51:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: use calloc() instead of malloc()/memset() in xen-mceinj X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecc7647b37b179465244add2468552a33025f14d Author: David Vrabel AuthorDate: Mon Jun 23 18:56:59 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:23 2014 +0100 tools/mce: use calloc() instead of malloc()/memset() in xen-mceinj Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 51ca175..d4f889b 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -284,10 +284,9 @@ static uint64_t guest_mfn(xc_interface *xc_handle, err(xc_handle, "Failed to get platform information"); /* Get guest's pfn list */ - pfn_buf = malloc(sizeof(uint64_t) * max_gpfn); + pfn_buf = calloc(max_gpfn, sizeof(uint64_t)); if ( !pfn_buf ) err(xc_handle, "Failed to alloc pfn buf"); - memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn); ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); if ( ret < 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 Jul 05 16:51:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBq-0002DS-2D; Sat, 05 Jul 2014 16:51:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBp-0002DF-0D for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:53 +0000 Received: from [85.158.143.35:55075] by server-1.bemta-4.messagelabs.com id 84/B7-09496-82D28B35; Sat, 05 Jul 2014 16:51:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404579110!7998011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1786 invoked from network); 5 Jul 2014 16:51:51 -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 Jul 2014 16:51:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBm-0006Il-5L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBm-0002mU-4C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:50 +0000 Date: Sat, 05 Jul 2014 16:51:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: refactor xen-mceinj to ease injection of other MCEs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc31ff7b4c5741f0c487867f11e8af39e953bbe7 Author: David Vrabel AuthorDate: Mon Jun 23 18:57:00 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 tools/mce: refactor xen-mceinj to ease injection of other MCEs Make the set of MCEs that xen-mceinj can inject by data-driven instead of a whole pile of cut-and-paste functions. There is no functional change. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 192 ++++++++++--------------------- 1 files changed, 59 insertions(+), 133 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index d4f889b..1f872a5 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -58,28 +58,43 @@ #define MSR_IA32_MC0_MISC 0x00000403 #define MSR_IA32_MC0_CTL2 0x00000280 -/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ -#define MCG_STATUS_SRAO_LLC_VAL 0x5 -#define MCE_SRAO_LLC_BANK 0x7 -#define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL -#define MCi_MISC_SRAO_LLC_VAL 0x86UL - -/* Memory Patrol Scrub SRAO MCE */ -#define MCG_STATUS_SRAO_MEM_VAL 0x5 -#define MCE_SRAO_MEM_BANK 0x8 -#define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL -#define MCi_MISC_SRAO_MEM_VAL 0x86UL - -/* LLC EWB UCNA Error */ -#define MCG_STATUS_UCNA_LLC_VAL 0x0 -#define CMCI_UCNA_LLC_BANK 0x9 -#define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL -#define MCi_MISC_UCNA_LLC_VAL 0x86UL - -/* Error Types */ -#define MCE_SRAO_MEM 0x0 -#define MCE_SRAO_LLC 0x1 -#define CMCI_UCNA_LLC 0x2 +struct mce_info { + const char *description; + uint8_t mcg_stat; + unsigned int bank; + uint64_t mci_stat; + uint64_t mci_misc; + bool cmci; +}; + +static struct mce_info mce_table[] = { + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ + { + .description = "MCE_SRAO_MEM", + .mcg_stat = 0x5, + .bank = 7, + .mci_stat = 0xBD2000008000017Aull, + .mci_misc = 0x86ull, + }, + /* Memory Patrol Scrub SRAO MCE */ + { + .description = "MCE_SRAO_LLC", + .mcg_stat = 0x5, + .bank = 8, + .mci_stat = 0xBD000000004000CFull, + .mci_misc = 0x86ull, + }, + /* LLC EWB UCNA Error */ + { + .description = "CMCI_UCNA_LLC", + .mcg_stat = 0x0, + .bank = 9, + .mci_stat = 0xBC20000080000136ull, + .mci_misc = 0x86ull, + .cmci = true, + }, +}; +#define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[0])) #define LOGFILE stdout @@ -374,25 +389,23 @@ static int inject_mci_addr(xc_interface *xc_handle, MCi_type_ADDR, bank, val); } -static int inject_llc_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int inject(xc_interface *xc_handle, struct mce_info *mce, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL); + ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat); if ( ret ) err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, - MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL); + mce->bank, mce->mci_stat); if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, - MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); + mce->bank, mce->mci_misc); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR"); @@ -401,96 +414,17 @@ static int inject_llc_srao(xc_interface *xc_handle, if (!mfn_valid(mfn)) err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr); + ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr); if ( ret ) err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error"); - - return 0; -} - -static int inject_mem_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) -{ - uint64_t gpfn, mfn, haddr; - int ret = 0; - - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR"); - - ret = inject_mci_status(xc_handle, cpu_nr, - MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR"); - - ret = inject_mci_misc(xc_handle, cpu_nr, - MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR"); - - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr); - if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR"); - - ret = flush_msr_inj(xc_handle); - if ( ret ) - err(xc_handle, "Failed to inject MSR"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error"); - - return 0; -} - -static int inject_llc_ucna(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) -{ - uint64_t gpfn, mfn, haddr; - int ret = 0; - - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR"); - - ret = inject_mci_status(xc_handle, cpu_nr, - CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR"); - - ret = inject_mci_misc(xc_handle, cpu_nr, - CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR"); - - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr); - if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR"); - - ret = flush_msr_inj(xc_handle); - if ( ret ) - err(xc_handle, "Failed to inject MSR"); - ret = inject_cmci(xc_handle, cpu_nr); + if ( mce->cmci ) + ret = inject_cmci(xc_handle, cpu_nr); + else + ret = inject_mce(xc_handle, cpu_nr); if ( ret ) err(xc_handle, "Failed to inject MCE error"); @@ -533,6 +467,8 @@ static struct option opts[] = { static void help(void) { + unsigned int i; + printf("Usage: xen-mceinj [OPTION]...\n" "\n" "Mandatory arguments to long options are mandatory" @@ -542,17 +478,16 @@ static void help(void) " -d, --domain=DOMID target domain, the default is Xen itself\n" " -h, --help print this page\n" " -p, --page=ADDR physical address to report\n" - " -t, --type=ERROR error type\n" - " 0 : MCE_SRAO_MEM\n" - " 1 : MCE_SRAO_LLC\n" - " 2 : CMCI_UCNA_LLC\n" - "\n" - ); + " -t, --type=ERROR error type\n"); + + for ( i = 0; i < MCE_TABLE_SIZE; i++ ) + printf(" %2d : %s\n", + i, mce_table[i].description); } int main(int argc, char *argv[]) { - int type = MCE_SRAO_MEM; + int type = 0; int c, opt_index; uint32_t domid; xc_interface *xc_handle; @@ -626,22 +561,13 @@ int main(int argc, char *argv[]) goto out; } - switch ( type ) - { - case MCE_SRAO_MEM: - inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); - break; - case MCE_SRAO_LLC: - inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); - break; - case CMCI_UCNA_LLC: - inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); - break; - default: + if ( type < 0 || type >= MCE_TABLE_SIZE ) { err(xc_handle, "Unsupported error type"); - break; + goto out; } + inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr); + out: xc_interface_close(xc_handle); 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 Jul 05 16:51:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:51: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 1X3TBq-0002DS-2D; Sat, 05 Jul 2014 16:51:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBp-0002DF-0D for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:53 +0000 Received: from [85.158.143.35:55075] by server-1.bemta-4.messagelabs.com id 84/B7-09496-82D28B35; Sat, 05 Jul 2014 16:51:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1404579110!7998011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1786 invoked from network); 5 Jul 2014 16:51:51 -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 Jul 2014 16:51:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBm-0006Il-5L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBm-0002mU-4C for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:51:50 +0000 Date: Sat, 05 Jul 2014 16:51:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: refactor xen-mceinj to ease injection of other MCEs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc31ff7b4c5741f0c487867f11e8af39e953bbe7 Author: David Vrabel AuthorDate: Mon Jun 23 18:57:00 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 tools/mce: refactor xen-mceinj to ease injection of other MCEs Make the set of MCEs that xen-mceinj can inject by data-driven instead of a whole pile of cut-and-paste functions. There is no functional change. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 192 ++++++++++--------------------- 1 files changed, 59 insertions(+), 133 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index d4f889b..1f872a5 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -58,28 +58,43 @@ #define MSR_IA32_MC0_MISC 0x00000403 #define MSR_IA32_MC0_CTL2 0x00000280 -/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ -#define MCG_STATUS_SRAO_LLC_VAL 0x5 -#define MCE_SRAO_LLC_BANK 0x7 -#define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL -#define MCi_MISC_SRAO_LLC_VAL 0x86UL - -/* Memory Patrol Scrub SRAO MCE */ -#define MCG_STATUS_SRAO_MEM_VAL 0x5 -#define MCE_SRAO_MEM_BANK 0x8 -#define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL -#define MCi_MISC_SRAO_MEM_VAL 0x86UL - -/* LLC EWB UCNA Error */ -#define MCG_STATUS_UCNA_LLC_VAL 0x0 -#define CMCI_UCNA_LLC_BANK 0x9 -#define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL -#define MCi_MISC_UCNA_LLC_VAL 0x86UL - -/* Error Types */ -#define MCE_SRAO_MEM 0x0 -#define MCE_SRAO_LLC 0x1 -#define CMCI_UCNA_LLC 0x2 +struct mce_info { + const char *description; + uint8_t mcg_stat; + unsigned int bank; + uint64_t mci_stat; + uint64_t mci_misc; + bool cmci; +}; + +static struct mce_info mce_table[] = { + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ + { + .description = "MCE_SRAO_MEM", + .mcg_stat = 0x5, + .bank = 7, + .mci_stat = 0xBD2000008000017Aull, + .mci_misc = 0x86ull, + }, + /* Memory Patrol Scrub SRAO MCE */ + { + .description = "MCE_SRAO_LLC", + .mcg_stat = 0x5, + .bank = 8, + .mci_stat = 0xBD000000004000CFull, + .mci_misc = 0x86ull, + }, + /* LLC EWB UCNA Error */ + { + .description = "CMCI_UCNA_LLC", + .mcg_stat = 0x0, + .bank = 9, + .mci_stat = 0xBC20000080000136ull, + .mci_misc = 0x86ull, + .cmci = true, + }, +}; +#define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[0])) #define LOGFILE stdout @@ -374,25 +389,23 @@ static int inject_mci_addr(xc_interface *xc_handle, MCi_type_ADDR, bank, val); } -static int inject_llc_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int inject(xc_interface *xc_handle, struct mce_info *mce, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL); + ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat); if ( ret ) err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, - MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL); + mce->bank, mce->mci_stat); if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, - MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); + mce->bank, mce->mci_misc); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR"); @@ -401,96 +414,17 @@ static int inject_llc_srao(xc_interface *xc_handle, if (!mfn_valid(mfn)) err(xc_handle, "The MFN is not valid"); haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr); + ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr); if ( ret ) err(xc_handle, "Failed to inject MCi_ADDR MSR"); ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error"); - - return 0; -} - -static int inject_mem_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) -{ - uint64_t gpfn, mfn, haddr; - int ret = 0; - - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR"); - - ret = inject_mci_status(xc_handle, cpu_nr, - MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR"); - - ret = inject_mci_misc(xc_handle, cpu_nr, - MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR"); - - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr); - if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR"); - - ret = flush_msr_inj(xc_handle); - if ( ret ) - err(xc_handle, "Failed to inject MSR"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error"); - - return 0; -} - -static int inject_llc_ucna(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) -{ - uint64_t gpfn, mfn, haddr; - int ret = 0; - - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCG_STATUS MSR"); - - ret = inject_mci_status(xc_handle, cpu_nr, - CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_STATUS MSR"); - - ret = inject_mci_misc(xc_handle, cpu_nr, - CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); - if ( ret ) - err(xc_handle, "Failed to inject MCi_MISC MSR"); - - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr); - if ( ret ) - err(xc_handle, "Failed to inject MCi_ADDR MSR"); - - ret = flush_msr_inj(xc_handle); - if ( ret ) - err(xc_handle, "Failed to inject MSR"); - ret = inject_cmci(xc_handle, cpu_nr); + if ( mce->cmci ) + ret = inject_cmci(xc_handle, cpu_nr); + else + ret = inject_mce(xc_handle, cpu_nr); if ( ret ) err(xc_handle, "Failed to inject MCE error"); @@ -533,6 +467,8 @@ static struct option opts[] = { static void help(void) { + unsigned int i; + printf("Usage: xen-mceinj [OPTION]...\n" "\n" "Mandatory arguments to long options are mandatory" @@ -542,17 +478,16 @@ static void help(void) " -d, --domain=DOMID target domain, the default is Xen itself\n" " -h, --help print this page\n" " -p, --page=ADDR physical address to report\n" - " -t, --type=ERROR error type\n" - " 0 : MCE_SRAO_MEM\n" - " 1 : MCE_SRAO_LLC\n" - " 2 : CMCI_UCNA_LLC\n" - "\n" - ); + " -t, --type=ERROR error type\n"); + + for ( i = 0; i < MCE_TABLE_SIZE; i++ ) + printf(" %2d : %s\n", + i, mce_table[i].description); } int main(int argc, char *argv[]) { - int type = MCE_SRAO_MEM; + int type = 0; int c, opt_index; uint32_t domid; xc_interface *xc_handle; @@ -626,22 +561,13 @@ int main(int argc, char *argv[]) goto out; } - switch ( type ) - { - case MCE_SRAO_MEM: - inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); - break; - case MCE_SRAO_LLC: - inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); - break; - case CMCI_UCNA_LLC: - inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); - break; - default: + if ( type < 0 || type >= MCE_TABLE_SIZE ) { err(xc_handle, "Unsupported error type"); - break; + goto out; } + inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr); + out: xc_interface_close(xc_handle); 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 Jul 05 16:52:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TC0-0002Ey-4p; Sat, 05 Jul 2014 16:52:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBy-0002Ee-OO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:03 +0000 Received: from [85.158.143.35:55355] by server-3.bemta-4.messagelabs.com id A7/BE-16194-23D28B35; Sat, 05 Jul 2014 16:52:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404579120!16026953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9093 invoked from network); 5 Jul 2014 16:52: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; 5 Jul 2014 16:52:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBw-0006Iu-B1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBw-0002mu-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:00 +0000 Date: Sat, 05 Jul 2014 16:52:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: add more MCE types to xen-mceinj X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b3b9d3e1922177cc1a5a5218c11dc4e18e3ebc0 Author: David Vrabel AuthorDate: Mon Jun 23 18:57:01 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 tools/mce: add more MCE types to xen-mceinj Add a non-fatal MCE for AMD CPUs. Add a fatal (PCC set) MCE for Intel CPUs. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 1f872a5..8ad045f 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -93,6 +93,22 @@ static struct mce_info mce_table[] = { .mci_misc = 0x86ull, .cmci = true, }, + /* AMD L1 instruction cache data or tag parity. */ + { + .description = "AMD L1 icache parity", + .mcg_stat = 0x5, + .bank = 1, + .mci_stat = 0x9400000000000151ull, + .mci_misc = 0x86ull, + }, + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ + { + .description = "MCE_SRAO_MEM (Fatal)", + .mcg_stat = 0x5, + .bank = 7, + .mci_stat = 0xBF2000008000017Aull, + .mci_misc = 0x86ull, + }, }; #define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[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 Jul 05 16:52:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TC0-0002Ey-4p; Sat, 05 Jul 2014 16:52:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBy-0002Ee-OO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:03 +0000 Received: from [85.158.143.35:55355] by server-3.bemta-4.messagelabs.com id A7/BE-16194-23D28B35; Sat, 05 Jul 2014 16:52:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404579120!16026953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9093 invoked from network); 5 Jul 2014 16:52: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; 5 Jul 2014 16:52:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TBw-0006Iu-B1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TBw-0002mu-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:00 +0000 Date: Sat, 05 Jul 2014 16:52:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mce: add more MCE types to xen-mceinj X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b3b9d3e1922177cc1a5a5218c11dc4e18e3ebc0 Author: David Vrabel AuthorDate: Mon Jun 23 18:57:01 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 tools/mce: add more MCE types to xen-mceinj Add a non-fatal MCE for AMD CPUs. Add a fatal (PCC set) MCE for Intel CPUs. Signed-off-by: David Vrabel Acked-by: Christoph Egger Acked-by: Ian Campbell --- tools/tests/mce-test/tools/xen-mceinj.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 1f872a5..8ad045f 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -93,6 +93,22 @@ static struct mce_info mce_table[] = { .mci_misc = 0x86ull, .cmci = true, }, + /* AMD L1 instruction cache data or tag parity. */ + { + .description = "AMD L1 icache parity", + .mcg_stat = 0x5, + .bank = 1, + .mci_stat = 0x9400000000000151ull, + .mci_misc = 0x86ull, + }, + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ + { + .description = "MCE_SRAO_MEM (Fatal)", + .mcg_stat = 0x5, + .bank = 7, + .mci_stat = 0xBF2000008000017Aull, + .mci_misc = 0x86ull, + }, }; #define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[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 Jul 05 16:52:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCB-0002Gq-7Y; Sat, 05 Jul 2014 16:52:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TC9-0002Gf-RL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:14 +0000 Received: from [85.158.137.68:56450] by server-3.bemta-3.messagelabs.com id F4/8C-25808-D3D28B35; Sat, 05 Jul 2014 16:52:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579131!14275151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32294 invoked from network); 5 Jul 2014 16:52:12 -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 Jul 2014 16:52:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TC6-0006JT-Rc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TC6-0002o4-Fd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:10 +0000 Date: Sat, 05 Jul 2014 16:52:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move io.h as mmio.h to include folder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6320ce95b9c2de58f2bb28639ae2ef4b6e37c728 Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:53 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: move io.h as mmio.h to include folder io.h is local to arch/arm folder. move this file as mmio.h file to include/asm-arm folder as it might be required for inclusion in other header files in future. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/io.c | 3 +- xen/arch/arm/io.h | 57 -------------------------------------------- xen/arch/arm/traps.c | 2 +- xen/arch/arm/vgic.c | 2 +- xen/arch/arm/vuart.c | 2 +- xen/include/asm-arm/mmio.h | 57 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 62 deletions(-) diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index a6db00b..ada1918 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -19,8 +19,7 @@ #include #include #include - -#include "io.h" +#include static const struct mmio_handler *const mmio_handlers[] = { diff --git a/xen/arch/arm/io.h b/xen/arch/arm/io.h deleted file mode 100644 index 8d252c0..0000000 --- a/xen/arch/arm/io.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * xen/arch/arm/io.h - * - * ARM I/O handlers - * - * Copyright (c) 2011 Citrix Systems. - * - * 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. - */ - -#ifndef __ARCH_ARM_IO_H__ -#define __ARCH_ARM_IO_H__ - -#include -#include -#include - -typedef struct -{ - struct hsr_dabt dabt; - vaddr_t gva; - paddr_t gpa; -} mmio_info_t; - -typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); -typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); -typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); - -struct mmio_handler { - mmio_check_t check_handler; - mmio_read_t read_handler; - mmio_write_t write_handler; -}; - -extern const struct mmio_handler vgic_distr_mmio_handler; -extern const struct mmio_handler vuart_mmio_handler; - -extern int handle_mmio(mmio_info_t *info); - -#endif - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 2fde0dd..686d8b7 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -36,9 +36,9 @@ #include #include #include +#include #include "decode.h" -#include "io.h" #include "vtimer.h" #include diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 757707e..155aed8 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -27,7 +27,7 @@ #include -#include "io.h" +#include #include #define REG(n) (n/4) diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index c02a8a9..953cd46 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -38,9 +38,9 @@ #include #include #include +#include #include "vuart.h" -#include "io.h" #define domain_has_vuart(d) ((d)->arch.vuart.info != NULL) diff --git a/xen/include/asm-arm/mmio.h b/xen/include/asm-arm/mmio.h new file mode 100644 index 0000000..5870985 --- /dev/null +++ b/xen/include/asm-arm/mmio.h @@ -0,0 +1,57 @@ +/* + * xen/include/asm-arm/mmio.h + * + * ARM I/O handlers + * + * Copyright (c) 2011 Citrix Systems. + * + * 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. + */ + +#ifndef __ASM_ARM_MMIO_H__ +#define __ASM_ARM_MMIO_H__ + +#include +#include +#include + +typedef struct +{ + struct hsr_dabt dabt; + vaddr_t gva; + paddr_t gpa; +} mmio_info_t; + +typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); +typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); +typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); + +struct mmio_handler { + mmio_check_t check_handler; + mmio_read_t read_handler; + mmio_write_t write_handler; +}; + +extern const struct mmio_handler vgic_distr_mmio_handler; +extern const struct mmio_handler vuart_mmio_handler; + +extern int handle_mmio(mmio_info_t *info); + +#endif /* __ASM_ARM_MMIO_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 Jul 05 16:52:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCB-0002Gq-7Y; Sat, 05 Jul 2014 16:52:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TC9-0002Gf-RL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:14 +0000 Received: from [85.158.137.68:56450] by server-3.bemta-3.messagelabs.com id F4/8C-25808-D3D28B35; Sat, 05 Jul 2014 16:52:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579131!14275151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32294 invoked from network); 5 Jul 2014 16:52:12 -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 Jul 2014 16:52:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TC6-0006JT-Rc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TC6-0002o4-Fd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:10 +0000 Date: Sat, 05 Jul 2014 16:52:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move io.h as mmio.h to include folder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6320ce95b9c2de58f2bb28639ae2ef4b6e37c728 Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:53 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: move io.h as mmio.h to include folder io.h is local to arch/arm folder. move this file as mmio.h file to include/asm-arm folder as it might be required for inclusion in other header files in future. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/io.c | 3 +- xen/arch/arm/io.h | 57 -------------------------------------------- xen/arch/arm/traps.c | 2 +- xen/arch/arm/vgic.c | 2 +- xen/arch/arm/vuart.c | 2 +- xen/include/asm-arm/mmio.h | 57 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 62 deletions(-) diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index a6db00b..ada1918 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -19,8 +19,7 @@ #include #include #include - -#include "io.h" +#include static const struct mmio_handler *const mmio_handlers[] = { diff --git a/xen/arch/arm/io.h b/xen/arch/arm/io.h deleted file mode 100644 index 8d252c0..0000000 --- a/xen/arch/arm/io.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * xen/arch/arm/io.h - * - * ARM I/O handlers - * - * Copyright (c) 2011 Citrix Systems. - * - * 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. - */ - -#ifndef __ARCH_ARM_IO_H__ -#define __ARCH_ARM_IO_H__ - -#include -#include -#include - -typedef struct -{ - struct hsr_dabt dabt; - vaddr_t gva; - paddr_t gpa; -} mmio_info_t; - -typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); -typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); -typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); - -struct mmio_handler { - mmio_check_t check_handler; - mmio_read_t read_handler; - mmio_write_t write_handler; -}; - -extern const struct mmio_handler vgic_distr_mmio_handler; -extern const struct mmio_handler vuart_mmio_handler; - -extern int handle_mmio(mmio_info_t *info); - -#endif - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 2fde0dd..686d8b7 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -36,9 +36,9 @@ #include #include #include +#include #include "decode.h" -#include "io.h" #include "vtimer.h" #include diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 757707e..155aed8 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -27,7 +27,7 @@ #include -#include "io.h" +#include #include #define REG(n) (n/4) diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index c02a8a9..953cd46 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -38,9 +38,9 @@ #include #include #include +#include #include "vuart.h" -#include "io.h" #define domain_has_vuart(d) ((d)->arch.vuart.info != NULL) diff --git a/xen/include/asm-arm/mmio.h b/xen/include/asm-arm/mmio.h new file mode 100644 index 0000000..5870985 --- /dev/null +++ b/xen/include/asm-arm/mmio.h @@ -0,0 +1,57 @@ +/* + * xen/include/asm-arm/mmio.h + * + * ARM I/O handlers + * + * Copyright (c) 2011 Citrix Systems. + * + * 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. + */ + +#ifndef __ASM_ARM_MMIO_H__ +#define __ASM_ARM_MMIO_H__ + +#include +#include +#include + +typedef struct +{ + struct hsr_dabt dabt; + vaddr_t gva; + paddr_t gpa; +} mmio_info_t; + +typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); +typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); +typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); + +struct mmio_handler { + mmio_check_t check_handler; + mmio_read_t read_handler; + mmio_write_t write_handler; +}; + +extern const struct mmio_handler vgic_distr_mmio_handler; +extern const struct mmio_handler vuart_mmio_handler; + +extern int handle_mmio(mmio_info_t *info); + +#endif /* __ASM_ARM_MMIO_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 Jul 05 16:52:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCL-0002IJ-AG; Sat, 05 Jul 2014 16:52:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCK-0002I7-CK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:24 +0000 Received: from [85.158.137.68:56675] by server-4.bemta-3.messagelabs.com id EA/0D-23732-74D28B35; Sat, 05 Jul 2014 16:52:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1404579141!14255253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1704 invoked from network); 5 Jul 2014 16:52:22 -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; 5 Jul 2014 16:52:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCH-0006JZ-0c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCG-0002oW-VA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:20 +0000 Date: Sat, 05 Jul 2014 16:52:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make mmio handlers domain 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 07b92af3d948ebb882af0f4344245df74155d44e Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:54 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: make mmio handlers domain specific register mmio handlers at runtime and make mmio handlers domain specific and check handlers are removed. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 3 ++ xen/arch/arm/io.c | 56 +++++++++++++++++++++++++++++++++--------- xen/arch/arm/vgic.c | 28 +++++++++++--------- xen/arch/arm/vuart.c | 26 +++++++++---------- xen/include/asm-arm/domain.h | 2 + xen/include/asm-arm/mmio.h | 22 +++++++++++++--- 6 files changed, 94 insertions(+), 43 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 437885d..74fadbd 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -512,6 +512,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) share_xen_page_with_guest( virt_to_page(d->shared_info), d, XENSHARE_writable); + if ( (rc = domain_io_init(d)) != 0 ) + goto fail; + if ( (rc = p2m_alloc_table(d)) != 0 ) goto fail; diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index ada1918..8e55d49 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -1,5 +1,5 @@ /* - * xen/arch/arm/io.h + * xen/arch/arm/io.c * * ARM I/O handlers * @@ -18,29 +18,61 @@ #include #include +#include +#include #include #include -static const struct mmio_handler *const mmio_handlers[] = -{ - &vgic_distr_mmio_handler, - &vuart_mmio_handler, -}; -#define MMIO_HANDLER_NR ARRAY_SIZE(mmio_handlers) - int handle_mmio(mmio_info_t *info) { struct vcpu *v = current; int i; + const struct mmio_handler *mmio_handler; + const struct io_handler *io_handlers = &v->domain->arch.io_handlers; - for ( i = 0; i < MMIO_HANDLER_NR; i++ ) - if ( mmio_handlers[i]->check_handler(v, info->gpa) ) + for ( i = 0; i < io_handlers->num_entries; i++ ) + { + mmio_handler = &io_handlers->mmio_handlers[i]; + + if ( (info->gpa >= mmio_handler->addr) && + (info->gpa < (mmio_handler->addr + mmio_handler->size)) ) + { return info->dabt.write ? - mmio_handlers[i]->write_handler(v, info) : - mmio_handlers[i]->read_handler(v, info); + mmio_handler->mmio_handler_ops->write_handler(v, info) : + mmio_handler->mmio_handler_ops->read_handler(v, info); + } + } return 0; } + +void register_mmio_handler(struct domain *d, + const struct mmio_handler_ops *handle, + paddr_t addr, paddr_t size) +{ + struct io_handler *handler = &d->arch.io_handlers; + + BUG_ON(handler->num_entries >= MAX_IO_HANDLER); + + spin_lock(&handler->lock); + + handler->mmio_handlers[handler->num_entries].mmio_handler_ops = handle; + handler->mmio_handlers[handler->num_entries].addr = addr; + handler->mmio_handlers[handler->num_entries].size = size; + dsb(ish); + handler->num_entries++; + + spin_unlock(&handler->lock); +} + +int domain_io_init(struct domain *d) +{ + spin_lock_init(&d->arch.io_handlers.lock); + d->arch.io_handlers.num_entries = 0; + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 155aed8..074d2f3 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -35,6 +35,9 @@ /* Number of ranks of interrupt registers for a domain */ #define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) +static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); +static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); + /* * Rank containing GICD_ for GICD_ with * -bits-per-interrupt @@ -78,6 +81,11 @@ static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) return vgic_rank_offset(v, 8, irq >> 2); } +static const struct mmio_handler_ops vgic_distr_mmio_handler = { + .read_handler = vgic_distr_mmio_read, + .write_handler = vgic_distr_mmio_write, +}; + int domain_vgic_init(struct domain *d) { int i; @@ -112,6 +120,13 @@ int domain_vgic_init(struct domain *d) } for (i=0; iarch.vgic.shared_irqs[i].lock); + + /* + * We rely on gicv_setup() to initialize dbase(vGIC distributor base) + */ + register_mmio_handler(d, &vgic_distr_mmio_handler, + d->arch.vgic.dbase, PAGE_SIZE); + return 0; } @@ -684,19 +699,6 @@ write_ignore: return 1; } -static int vgic_distr_mmio_check(struct vcpu *v, paddr_t addr) -{ - struct domain *d = v->domain; - - return (addr >= (d->arch.vgic.dbase)) && (addr < (d->arch.vgic.dbase + PAGE_SIZE)); -} - -const struct mmio_handler vgic_distr_mmio_handler = { - .check_handler = vgic_distr_mmio_check, - .read_handler = vgic_distr_mmio_read, - .write_handler = vgic_distr_mmio_write, -}; - struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq) { struct pending_irq *n; diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index 953cd46..e327c15 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -44,6 +44,14 @@ #define domain_has_vuart(d) ((d)->arch.vuart.info != NULL) +static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info); +static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info); + +static const struct mmio_handler_ops vuart_mmio_handler = { + .read_handler = vuart_mmio_read, + .write_handler = vuart_mmio_write, +}; + int domain_vuart_init(struct domain *d) { ASSERT( is_hardware_domain(d) ); @@ -59,6 +67,10 @@ int domain_vuart_init(struct domain *d) if ( !d->arch.vuart.buf ) return -ENOMEM; + register_mmio_handler(d, &vuart_mmio_handler, + d->arch.vuart.info->base_addr, + d->arch.vuart.info->size); + return 0; } @@ -92,14 +104,6 @@ static void vuart_print_char(struct vcpu *v, char c) spin_unlock(&uart->lock); } -static int vuart_mmio_check(struct vcpu *v, paddr_t addr) -{ - const struct vuart_info *info = v->domain->arch.vuart.info; - - return (domain_has_vuart(v->domain) && addr >= info->base_addr && - addr <= (info->base_addr + info->size)); -} - static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info) { struct domain *d = v->domain; @@ -133,12 +137,6 @@ static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; } -const struct mmio_handler vuart_mmio_handler = { - .check_handler = vuart_mmio_check, - .read_handler = vuart_mmio_read, - .write_handler = vuart_mmio_write, -}; - /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 2cb6837..046362c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -119,6 +120,7 @@ struct arch_domain struct hvm_domain hvm_domain; xen_pfn_t *grant_table_gpfn; + struct io_handler io_handlers; /* Continuable domain_relinquish_resources(). */ enum { RELMEM_not_started, diff --git a/xen/include/asm-arm/mmio.h b/xen/include/asm-arm/mmio.h index 5870985..0160f09 100644 --- a/xen/include/asm-arm/mmio.h +++ b/xen/include/asm-arm/mmio.h @@ -23,6 +23,8 @@ #include #include +#define MAX_IO_HANDLER 16 + typedef struct { struct hsr_dabt dabt; @@ -34,16 +36,28 @@ typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); -struct mmio_handler { - mmio_check_t check_handler; +struct mmio_handler_ops { mmio_read_t read_handler; mmio_write_t write_handler; }; -extern const struct mmio_handler vgic_distr_mmio_handler; -extern const struct mmio_handler vuart_mmio_handler; +struct mmio_handler { + paddr_t addr; + paddr_t size; + const struct mmio_handler_ops *mmio_handler_ops; +}; + +struct io_handler { + int num_entries; + spinlock_t lock; + struct mmio_handler mmio_handlers[MAX_IO_HANDLER]; +}; extern int handle_mmio(mmio_info_t *info); +void register_mmio_handler(struct domain *d, + const struct mmio_handler_ops *handle, + paddr_t addr, paddr_t size); +int domain_io_init(struct domain *d); #endif /* __ASM_ARM_MMIO_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 Jul 05 16:52:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCL-0002IJ-AG; Sat, 05 Jul 2014 16:52:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCK-0002I7-CK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:24 +0000 Received: from [85.158.137.68:56675] by server-4.bemta-3.messagelabs.com id EA/0D-23732-74D28B35; Sat, 05 Jul 2014 16:52:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1404579141!14255253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1704 invoked from network); 5 Jul 2014 16:52:22 -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; 5 Jul 2014 16:52:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCH-0006JZ-0c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCG-0002oW-VA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:20 +0000 Date: Sat, 05 Jul 2014 16:52:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make mmio handlers domain 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 07b92af3d948ebb882af0f4344245df74155d44e Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:54 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: make mmio handlers domain specific register mmio handlers at runtime and make mmio handlers domain specific and check handlers are removed. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 3 ++ xen/arch/arm/io.c | 56 +++++++++++++++++++++++++++++++++--------- xen/arch/arm/vgic.c | 28 +++++++++++--------- xen/arch/arm/vuart.c | 26 +++++++++---------- xen/include/asm-arm/domain.h | 2 + xen/include/asm-arm/mmio.h | 22 +++++++++++++--- 6 files changed, 94 insertions(+), 43 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 437885d..74fadbd 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -512,6 +512,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) share_xen_page_with_guest( virt_to_page(d->shared_info), d, XENSHARE_writable); + if ( (rc = domain_io_init(d)) != 0 ) + goto fail; + if ( (rc = p2m_alloc_table(d)) != 0 ) goto fail; diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index ada1918..8e55d49 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -1,5 +1,5 @@ /* - * xen/arch/arm/io.h + * xen/arch/arm/io.c * * ARM I/O handlers * @@ -18,29 +18,61 @@ #include #include +#include +#include #include #include -static const struct mmio_handler *const mmio_handlers[] = -{ - &vgic_distr_mmio_handler, - &vuart_mmio_handler, -}; -#define MMIO_HANDLER_NR ARRAY_SIZE(mmio_handlers) - int handle_mmio(mmio_info_t *info) { struct vcpu *v = current; int i; + const struct mmio_handler *mmio_handler; + const struct io_handler *io_handlers = &v->domain->arch.io_handlers; - for ( i = 0; i < MMIO_HANDLER_NR; i++ ) - if ( mmio_handlers[i]->check_handler(v, info->gpa) ) + for ( i = 0; i < io_handlers->num_entries; i++ ) + { + mmio_handler = &io_handlers->mmio_handlers[i]; + + if ( (info->gpa >= mmio_handler->addr) && + (info->gpa < (mmio_handler->addr + mmio_handler->size)) ) + { return info->dabt.write ? - mmio_handlers[i]->write_handler(v, info) : - mmio_handlers[i]->read_handler(v, info); + mmio_handler->mmio_handler_ops->write_handler(v, info) : + mmio_handler->mmio_handler_ops->read_handler(v, info); + } + } return 0; } + +void register_mmio_handler(struct domain *d, + const struct mmio_handler_ops *handle, + paddr_t addr, paddr_t size) +{ + struct io_handler *handler = &d->arch.io_handlers; + + BUG_ON(handler->num_entries >= MAX_IO_HANDLER); + + spin_lock(&handler->lock); + + handler->mmio_handlers[handler->num_entries].mmio_handler_ops = handle; + handler->mmio_handlers[handler->num_entries].addr = addr; + handler->mmio_handlers[handler->num_entries].size = size; + dsb(ish); + handler->num_entries++; + + spin_unlock(&handler->lock); +} + +int domain_io_init(struct domain *d) +{ + spin_lock_init(&d->arch.io_handlers.lock); + d->arch.io_handlers.num_entries = 0; + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 155aed8..074d2f3 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -35,6 +35,9 @@ /* Number of ranks of interrupt registers for a domain */ #define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) +static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); +static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); + /* * Rank containing GICD_ for GICD_ with * -bits-per-interrupt @@ -78,6 +81,11 @@ static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) return vgic_rank_offset(v, 8, irq >> 2); } +static const struct mmio_handler_ops vgic_distr_mmio_handler = { + .read_handler = vgic_distr_mmio_read, + .write_handler = vgic_distr_mmio_write, +}; + int domain_vgic_init(struct domain *d) { int i; @@ -112,6 +120,13 @@ int domain_vgic_init(struct domain *d) } for (i=0; iarch.vgic.shared_irqs[i].lock); + + /* + * We rely on gicv_setup() to initialize dbase(vGIC distributor base) + */ + register_mmio_handler(d, &vgic_distr_mmio_handler, + d->arch.vgic.dbase, PAGE_SIZE); + return 0; } @@ -684,19 +699,6 @@ write_ignore: return 1; } -static int vgic_distr_mmio_check(struct vcpu *v, paddr_t addr) -{ - struct domain *d = v->domain; - - return (addr >= (d->arch.vgic.dbase)) && (addr < (d->arch.vgic.dbase + PAGE_SIZE)); -} - -const struct mmio_handler vgic_distr_mmio_handler = { - .check_handler = vgic_distr_mmio_check, - .read_handler = vgic_distr_mmio_read, - .write_handler = vgic_distr_mmio_write, -}; - struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq) { struct pending_irq *n; diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index 953cd46..e327c15 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -44,6 +44,14 @@ #define domain_has_vuart(d) ((d)->arch.vuart.info != NULL) +static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info); +static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info); + +static const struct mmio_handler_ops vuart_mmio_handler = { + .read_handler = vuart_mmio_read, + .write_handler = vuart_mmio_write, +}; + int domain_vuart_init(struct domain *d) { ASSERT( is_hardware_domain(d) ); @@ -59,6 +67,10 @@ int domain_vuart_init(struct domain *d) if ( !d->arch.vuart.buf ) return -ENOMEM; + register_mmio_handler(d, &vuart_mmio_handler, + d->arch.vuart.info->base_addr, + d->arch.vuart.info->size); + return 0; } @@ -92,14 +104,6 @@ static void vuart_print_char(struct vcpu *v, char c) spin_unlock(&uart->lock); } -static int vuart_mmio_check(struct vcpu *v, paddr_t addr) -{ - const struct vuart_info *info = v->domain->arch.vuart.info; - - return (domain_has_vuart(v->domain) && addr >= info->base_addr && - addr <= (info->base_addr + info->size)); -} - static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info) { struct domain *d = v->domain; @@ -133,12 +137,6 @@ static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; } -const struct mmio_handler vuart_mmio_handler = { - .check_handler = vuart_mmio_check, - .read_handler = vuart_mmio_read, - .write_handler = vuart_mmio_write, -}; - /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 2cb6837..046362c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -119,6 +120,7 @@ struct arch_domain struct hvm_domain hvm_domain; xen_pfn_t *grant_table_gpfn; + struct io_handler io_handlers; /* Continuable domain_relinquish_resources(). */ enum { RELMEM_not_started, diff --git a/xen/include/asm-arm/mmio.h b/xen/include/asm-arm/mmio.h index 5870985..0160f09 100644 --- a/xen/include/asm-arm/mmio.h +++ b/xen/include/asm-arm/mmio.h @@ -23,6 +23,8 @@ #include #include +#define MAX_IO_HANDLER 16 + typedef struct { struct hsr_dabt dabt; @@ -34,16 +36,28 @@ typedef int (*mmio_read_t)(struct vcpu *v, mmio_info_t *info); typedef int (*mmio_write_t)(struct vcpu *v, mmio_info_t *info); typedef int (*mmio_check_t)(struct vcpu *v, paddr_t addr); -struct mmio_handler { - mmio_check_t check_handler; +struct mmio_handler_ops { mmio_read_t read_handler; mmio_write_t write_handler; }; -extern const struct mmio_handler vgic_distr_mmio_handler; -extern const struct mmio_handler vuart_mmio_handler; +struct mmio_handler { + paddr_t addr; + paddr_t size; + const struct mmio_handler_ops *mmio_handler_ops; +}; + +struct io_handler { + int num_entries; + spinlock_t lock; + struct mmio_handler mmio_handlers[MAX_IO_HANDLER]; +}; extern int handle_mmio(mmio_info_t *info); +void register_mmio_handler(struct domain *d, + const struct mmio_handler_ops *handle, + paddr_t addr, paddr_t size); +int domain_io_init(struct domain *d); #endif /* __ASM_ARM_MMIO_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 Jul 05 16:52:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCV-0002K6-Ei; Sat, 05 Jul 2014 16:52:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCT-0002Ji-OA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:33 +0000 Received: from [85.158.139.211:3025] by server-17.bemta-5.messagelabs.com id 8B/1A-08711-15D28B35; Sat, 05 Jul 2014 16:52:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1404579151!10492676!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1110 invoked from network); 5 Jul 2014 16:52:32 -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; 5 Jul 2014 16:52:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCR-0006Jh-72 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCR-0002ov-4B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:31 +0000 Date: Sat, 05 Jul 2014 16:52:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: remove unused parameter in do_sgi call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 012098b81b82e550410f4b9d04029c3dc81ea253 Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:56 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: remove unused parameter in do_sgi call othercpu parameter in do_sgi is unused Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 4d2a92d..0ca0234 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -829,7 +829,7 @@ void gic_inject(void) } -static void do_sgi(struct cpu_user_regs *regs, int othercpu, enum gic_sgi sgi) +static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ GICC[GICC_EOIR] = sgi; @@ -873,8 +873,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) } else if (unlikely(irq < 16)) { - unsigned int cpu = (intack & GICC_IA_CPU_MASK) >> GICC_IA_CPU_SHIFT; - do_sgi(regs, cpu, irq); + do_sgi(regs, irq); } 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 Sat Jul 05 16:52:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCV-0002K6-Ei; Sat, 05 Jul 2014 16:52:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCT-0002Ji-OA for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:33 +0000 Received: from [85.158.139.211:3025] by server-17.bemta-5.messagelabs.com id 8B/1A-08711-15D28B35; Sat, 05 Jul 2014 16:52:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1404579151!10492676!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1110 invoked from network); 5 Jul 2014 16:52:32 -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; 5 Jul 2014 16:52:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCR-0006Jh-72 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCR-0002ov-4B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:31 +0000 Date: Sat, 05 Jul 2014 16:52:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: remove unused parameter in do_sgi call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 012098b81b82e550410f4b9d04029c3dc81ea253 Author: Vijaya Kumar K AuthorDate: Thu Jun 26 11:03:56 2014 +0530 Commit: Ian Campbell CommitDate: Fri Jun 27 14:13:24 2014 +0100 xen/arm: remove unused parameter in do_sgi call othercpu parameter in do_sgi is unused Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 4d2a92d..0ca0234 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -829,7 +829,7 @@ void gic_inject(void) } -static void do_sgi(struct cpu_user_regs *regs, int othercpu, enum gic_sgi sgi) +static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ GICC[GICC_EOIR] = sgi; @@ -873,8 +873,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) } else if (unlikely(irq < 16)) { - unsigned int cpu = (intack & GICC_IA_CPU_MASK) >> GICC_IA_CPU_SHIFT; - do_sgi(regs, cpu, irq); + do_sgi(regs, irq); } 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 Sat Jul 05 16:52:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCh-0002M1-HQ; Sat, 05 Jul 2014 16:52:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCg-0002Lm-3D for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:46 +0000 Received: from [85.158.139.211:64410] by server-13.bemta-5.messagelabs.com id 58/58-02995-D5D28B35; Sat, 05 Jul 2014 16:52:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1404579161!13866343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19982 invoked from network); 5 Jul 2014 16:52:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:52:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCb-0006Jn-DH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCb-0002pL-BU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:41 +0000 Date: Sat, 05 Jul 2014 16:52:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow a generation ID to be specified at domain creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfa33afa52f4c1a96620cd961dce1e32e33becb4 Author: David Vrabel AuthorDate: Fri Jun 27 14:57:51 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:55:57 2014 +0100 libxl: allow a generation ID to be specified at domain creation Toolstacks may specify a VM generation ID using the u.hvm.ms_vm_genid field in the libxl_domain_build_info structure, when creating a domain. The toolstack is responsible for providing the correct generation ID according to the Microsoft specification (e.g., generating new random ones with libxl_ms_vm_genid_generate() as appropriate when restoring). Although the specification requires that a ACPI Notify event is raised if the generation ID is changed, the generation ID is never changed when the domain is in a state to receive such an event (it's either newly created or suspended). Signed-off-by: David Vrabel Cc: David Scott Acked-by: Ian Campbell --- tools/libxl/Makefile | 1 + tools/libxl/gentest.py | 2 +- tools/libxl/libxl.h | 13 ++++ tools/libxl/libxl_dom.c | 10 +++ tools/libxl/libxl_genid.c | 111 ++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 6 ++ tools/libxl/libxl_json.c | 39 ++++++++++++ tools/libxl/libxl_json.h | 1 + tools/libxl/libxl_types.idl | 3 + tools/ocaml/libs/xl/genwrap.py | 1 + tools/ocaml/libs/xl/xenlight_stubs.c | 25 ++++++++ 11 files changed, 211 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 8dd8c95..78c1996 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -81,6 +81,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_json.o libxl_aoutils.o libxl_numa.o \ libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) +LIBXL_OBJS += libxl_genid.o LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o LIBXL_TESTS += timedereg diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index eb9a21b..0195bf4 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -60,7 +60,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s += "%s(%s);\n" % (ty.rand_init, ty.pass_arg(v, isref=parent is None, passby=idl.PASS_BY_REFERENCE)) - elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap"]: + elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap", "libxl_ms_vm_genid"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) elif ty.typename in ["libxl_domid", "libxl_devid"] or isinstance(ty, idl.Number): s += "%s = rand() %% (sizeof(%s)*8);\n" % \ diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index d63cd11..459557d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -104,6 +104,11 @@ #define LIBXL_HAVE_BUILDINFO_EVENT_CHANNELS 1 /* + * libxl_domain_build_info has the u.hvm.ms_vm_genid field. + */ +#define LIBXL_HAVE_BUILDINFO_HVM_MS_VM_GENID 1 + +/* * LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY indicates that a 'cpumap_soft' * field (of libxl_bitmap type) is present in libxl_vcpuinfo, * containing the soft affinity of a vcpu. @@ -639,6 +644,11 @@ const char *libxl_defbool_to_string(libxl_defbool b); #define LIBXL_TIMER_MODE_DEFAULT -1 #define LIBXL_MEMKB_DEFAULT ~0ULL +#define LIBXL_MS_VM_GENID_LEN 16 +typedef struct { + uint8_t bytes[LIBXL_MS_VM_GENID_LEN]; +} libxl_ms_vm_genid; + #include "_libxl_types.h" const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); @@ -1262,6 +1272,9 @@ int libxl_flask_getenforce(libxl_ctx *ctx); int libxl_flask_setenforce(libxl_ctx *ctx, int mode); int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); +int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id); +bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id); + /* misc */ /* Each of these sets or clears the flag according to whether the diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index acb0794..0448d17 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -339,6 +339,16 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, if (info->cpuid != NULL) libxl_cpuid_set(ctx, domid, info->cpuid); + if (info->type == LIBXL_DOMAIN_TYPE_HVM + && !libxl_ms_vm_genid_is_zero(&info->u.hvm.ms_vm_genid)) { + rc = libxl__ms_vm_genid_set(gc, domid, + &info->u.hvm.ms_vm_genid); + if (rc) { + LOG(ERROR, "Failed to set VM Generation ID"); + return rc; + } + } + ents = libxl__calloc(gc, 12 + (info->max_vcpus * 2) + 2, sizeof(char *)); ents[0] = "memory/static-max"; ents[1] = GCSPRINTF("%"PRId64, info->max_memkb); diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c new file mode 100644 index 0000000..9853fa6 --- /dev/null +++ b/tools/libxl/libxl_genid.c @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2014 Citrix Systems R&D Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include "libxl_internal.h" + +#include +#include + +/* + * Generate a random VM generation ID. + * + * Returns ERROR_FAIL if a suitable source of random numbers is not + * available. + * + * See Microsoft's "Virtual Machine Generation ID" specification for + * further details, including when a new generation ID is required. + * + * http://www.microsoft.com/en-us/download/details.aspx?id=30707 + */ +int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id) +{ + GC_INIT(ctx); + int ret; + + ret = libxl__random_bytes(gc, id->bytes, LIBXL_MS_VM_GENID_LEN); + + GC_FREE; + return ret; +} + +/* + * Is this VM generation ID all zeros? + */ +bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id) +{ + static const libxl_ms_vm_genid zero; + + return memcmp(id->bytes, zero.bytes, LIBXL_MS_VM_GENID_LEN) == 0; +} + +int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, + const libxl_ms_vm_genid *id) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + const char *dom_path; + uint64_t genid[2]; + uint64_t paddr = 0; + int rc; + + memcpy(genid, id->bytes, LIBXL_MS_VM_GENID_LEN); + + /* + * Set the "platform/generation-id" XenStore key to pass the ID to + * hvmloader. + */ + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + rc = libxl__xs_write(gc, XBT_NULL, + GCSPRINTF("%s/platform/generation-id", dom_path), + "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); + if (rc < 0) + goto out; + + /* + * Update the ID in guest memory (if available). + */ + xc_hvm_param_get(ctx->xch, domid, HVM_PARAM_VM_GENERATION_ID_ADDR, &paddr); + if (paddr) { + void *vaddr; + + vaddr = xc_map_foreign_range(ctx->xch, domid, XC_PAGE_SIZE, + PROT_READ | PROT_WRITE, + paddr >> XC_PAGE_SHIFT); + if (vaddr == NULL) { + rc = ERROR_FAIL; + goto out; + } + memcpy(vaddr + (paddr & ~XC_PAGE_MASK), genid, 2 * sizeof(*genid)); + munmap(vaddr, XC_PAGE_SIZE); + + /* + * The spec requires an ACPI Notify event is injected into the + * guest when the generation ID is changed. + * + * This is only called for domains that are suspended or newly + * created and they won't be in a state to receive such an + * event. + */ + } + + rc = 0; + + out: + return rc; +} diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d4f32a9..2eea557 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3086,6 +3086,10 @@ void libxl__numa_candidate_put_nodemap(libxl__gc *gc, libxl_bitmap_copy(CTX, &cndt->nodemap, nodemap); } +_hidden int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, + const libxl_ms_vm_genid *id); + + /* Som handy macros for defbool type. */ #define LIBXL__DEFBOOL_DEFAULT (0) #define LIBXL__DEFBOOL_FALSE (-1) @@ -3163,6 +3167,8 @@ int libxl_key_value_list_parse_json(libxl__gc *gc, libxl_key_value_list *p); int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, libxl_hwcap *p); +int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p); int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, void *p); int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index fb9baf8..63125dc 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -377,6 +377,45 @@ int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, return 0; } +yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p) +{ + yajl_gen_status s; + int i; + + s = yajl_gen_array_open(hand); + if (s != yajl_gen_status_ok) + return s; + + for (i = 0; i < LIBXL_MS_VM_GENID_LEN; i++) { + s = yajl_gen_integer(hand, p->bytes[i]); + if (s != yajl_gen_status_ok) + return s; + } + + return yajl_gen_array_close(hand); +} + +int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p) +{ + unsigned int i; + + if (!libxl__json_object_is_array(o)) + return ERROR_FAIL; + + for (i = 0; i < LIBXL_MS_VM_GENID_LEN; i++) { + const libxl__json_object *t; + + t = libxl__json_array_get(o, i); + if (!t || !libxl__json_object_is_integer(t)) + return ERROR_FAIL; + + p->bytes[i] = libxl__json_object_get_integer(t); + } + + return 0; +} + yajl_gen_status libxl__string_gen_json(yajl_gen hand, const char *p) { diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h index e4c0f6c..af26e78 100644 --- a/tools/libxl/libxl_json.h +++ b/tools/libxl/libxl_json.h @@ -33,6 +33,7 @@ yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p); yajl_gen_status libxl_key_value_list_gen_json(yajl_gen hand, libxl_key_value_list *p); yajl_gen_status libxl_hwcap_gen_json(yajl_gen hand, libxl_hwcap *p); +yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p); #include <_libxl_types_json.h> diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5607ea7..de25f42 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -17,6 +17,7 @@ libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_d libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE) libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE) # # Specific integer types @@ -378,6 +379,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("xen_platform_pci", libxl_defbool), ("usbdevice_list", libxl_string_list), ("vendor_device", libxl_vendor_device), + # See libxl_ms_vm_genid_generate() + ("ms_vm_genid", libxl_ms_vm_genid), ])), ("pv", Struct(None, [("kernel", string), ("slack_memkb", MemKB), diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5e43831..402e489 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -18,6 +18,7 @@ builtins = { "libxl_string_list": ("string list", "libxl_string_list_val(&%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), "libxl_mac": ("int array", "Mac_val(&%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), + "libxl_ms_vm_genid": ("int array", "Ms_vm_genid_val(&%(c)s, %(o)s)", "Val_ms_vm_genid(&%(c)s)"), # The following needs to be sorted out later "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 8e825ae..4133527 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -370,6 +370,31 @@ static value Val_hwcap(libxl_hwcap *c_val) CAMLreturn(hwcap); } +static value Val_ms_vm_genid (libxl_ms_vm_genid *c_val) +{ + CAMLparam0(); + CAMLlocal1(v); + int i; + + v = caml_alloc_tuple(LIBXL_MS_VM_GENID_LEN); + + for(i=0; ibytes[i])); + + CAMLreturn(v); +} + +static int Ms_vm_genid_val(libxl_ms_vm_genid *c_val, value v) +{ + CAMLparam1(v); + int i; + + for(i=0; ibytes[i] = Int_val(Field(v, i)); + + CAMLreturn(0); +} + static value Val_string_option(const char *c_val) { CAMLparam0(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:52:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCh-0002M1-HQ; Sat, 05 Jul 2014 16:52:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCg-0002Lm-3D for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:46 +0000 Received: from [85.158.139.211:64410] by server-13.bemta-5.messagelabs.com id 58/58-02995-D5D28B35; Sat, 05 Jul 2014 16:52:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1404579161!13866343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19982 invoked from network); 5 Jul 2014 16:52:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:52:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCb-0006Jn-DH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCb-0002pL-BU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:41 +0000 Date: Sat, 05 Jul 2014 16:52:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow a generation ID to be specified at domain creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfa33afa52f4c1a96620cd961dce1e32e33becb4 Author: David Vrabel AuthorDate: Fri Jun 27 14:57:51 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:55:57 2014 +0100 libxl: allow a generation ID to be specified at domain creation Toolstacks may specify a VM generation ID using the u.hvm.ms_vm_genid field in the libxl_domain_build_info structure, when creating a domain. The toolstack is responsible for providing the correct generation ID according to the Microsoft specification (e.g., generating new random ones with libxl_ms_vm_genid_generate() as appropriate when restoring). Although the specification requires that a ACPI Notify event is raised if the generation ID is changed, the generation ID is never changed when the domain is in a state to receive such an event (it's either newly created or suspended). Signed-off-by: David Vrabel Cc: David Scott Acked-by: Ian Campbell --- tools/libxl/Makefile | 1 + tools/libxl/gentest.py | 2 +- tools/libxl/libxl.h | 13 ++++ tools/libxl/libxl_dom.c | 10 +++ tools/libxl/libxl_genid.c | 111 ++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 6 ++ tools/libxl/libxl_json.c | 39 ++++++++++++ tools/libxl/libxl_json.h | 1 + tools/libxl/libxl_types.idl | 3 + tools/ocaml/libs/xl/genwrap.py | 1 + tools/ocaml/libs/xl/xenlight_stubs.c | 25 ++++++++ 11 files changed, 211 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 8dd8c95..78c1996 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -81,6 +81,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_json.o libxl_aoutils.o libxl_numa.o \ libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) +LIBXL_OBJS += libxl_genid.o LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o LIBXL_TESTS += timedereg diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index eb9a21b..0195bf4 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -60,7 +60,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s += "%s(%s);\n" % (ty.rand_init, ty.pass_arg(v, isref=parent is None, passby=idl.PASS_BY_REFERENCE)) - elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap"]: + elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap", "libxl_ms_vm_genid"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) elif ty.typename in ["libxl_domid", "libxl_devid"] or isinstance(ty, idl.Number): s += "%s = rand() %% (sizeof(%s)*8);\n" % \ diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index d63cd11..459557d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -104,6 +104,11 @@ #define LIBXL_HAVE_BUILDINFO_EVENT_CHANNELS 1 /* + * libxl_domain_build_info has the u.hvm.ms_vm_genid field. + */ +#define LIBXL_HAVE_BUILDINFO_HVM_MS_VM_GENID 1 + +/* * LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY indicates that a 'cpumap_soft' * field (of libxl_bitmap type) is present in libxl_vcpuinfo, * containing the soft affinity of a vcpu. @@ -639,6 +644,11 @@ const char *libxl_defbool_to_string(libxl_defbool b); #define LIBXL_TIMER_MODE_DEFAULT -1 #define LIBXL_MEMKB_DEFAULT ~0ULL +#define LIBXL_MS_VM_GENID_LEN 16 +typedef struct { + uint8_t bytes[LIBXL_MS_VM_GENID_LEN]; +} libxl_ms_vm_genid; + #include "_libxl_types.h" const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); @@ -1262,6 +1272,9 @@ int libxl_flask_getenforce(libxl_ctx *ctx); int libxl_flask_setenforce(libxl_ctx *ctx, int mode); int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); +int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id); +bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id); + /* misc */ /* Each of these sets or clears the flag according to whether the diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index acb0794..0448d17 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -339,6 +339,16 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, if (info->cpuid != NULL) libxl_cpuid_set(ctx, domid, info->cpuid); + if (info->type == LIBXL_DOMAIN_TYPE_HVM + && !libxl_ms_vm_genid_is_zero(&info->u.hvm.ms_vm_genid)) { + rc = libxl__ms_vm_genid_set(gc, domid, + &info->u.hvm.ms_vm_genid); + if (rc) { + LOG(ERROR, "Failed to set VM Generation ID"); + return rc; + } + } + ents = libxl__calloc(gc, 12 + (info->max_vcpus * 2) + 2, sizeof(char *)); ents[0] = "memory/static-max"; ents[1] = GCSPRINTF("%"PRId64, info->max_memkb); diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c new file mode 100644 index 0000000..9853fa6 --- /dev/null +++ b/tools/libxl/libxl_genid.c @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2014 Citrix Systems R&D Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include "libxl_internal.h" + +#include +#include + +/* + * Generate a random VM generation ID. + * + * Returns ERROR_FAIL if a suitable source of random numbers is not + * available. + * + * See Microsoft's "Virtual Machine Generation ID" specification for + * further details, including when a new generation ID is required. + * + * http://www.microsoft.com/en-us/download/details.aspx?id=30707 + */ +int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id) +{ + GC_INIT(ctx); + int ret; + + ret = libxl__random_bytes(gc, id->bytes, LIBXL_MS_VM_GENID_LEN); + + GC_FREE; + return ret; +} + +/* + * Is this VM generation ID all zeros? + */ +bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id) +{ + static const libxl_ms_vm_genid zero; + + return memcmp(id->bytes, zero.bytes, LIBXL_MS_VM_GENID_LEN) == 0; +} + +int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, + const libxl_ms_vm_genid *id) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + const char *dom_path; + uint64_t genid[2]; + uint64_t paddr = 0; + int rc; + + memcpy(genid, id->bytes, LIBXL_MS_VM_GENID_LEN); + + /* + * Set the "platform/generation-id" XenStore key to pass the ID to + * hvmloader. + */ + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + rc = libxl__xs_write(gc, XBT_NULL, + GCSPRINTF("%s/platform/generation-id", dom_path), + "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); + if (rc < 0) + goto out; + + /* + * Update the ID in guest memory (if available). + */ + xc_hvm_param_get(ctx->xch, domid, HVM_PARAM_VM_GENERATION_ID_ADDR, &paddr); + if (paddr) { + void *vaddr; + + vaddr = xc_map_foreign_range(ctx->xch, domid, XC_PAGE_SIZE, + PROT_READ | PROT_WRITE, + paddr >> XC_PAGE_SHIFT); + if (vaddr == NULL) { + rc = ERROR_FAIL; + goto out; + } + memcpy(vaddr + (paddr & ~XC_PAGE_MASK), genid, 2 * sizeof(*genid)); + munmap(vaddr, XC_PAGE_SIZE); + + /* + * The spec requires an ACPI Notify event is injected into the + * guest when the generation ID is changed. + * + * This is only called for domains that are suspended or newly + * created and they won't be in a state to receive such an + * event. + */ + } + + rc = 0; + + out: + return rc; +} diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d4f32a9..2eea557 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3086,6 +3086,10 @@ void libxl__numa_candidate_put_nodemap(libxl__gc *gc, libxl_bitmap_copy(CTX, &cndt->nodemap, nodemap); } +_hidden int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, + const libxl_ms_vm_genid *id); + + /* Som handy macros for defbool type. */ #define LIBXL__DEFBOOL_DEFAULT (0) #define LIBXL__DEFBOOL_FALSE (-1) @@ -3163,6 +3167,8 @@ int libxl_key_value_list_parse_json(libxl__gc *gc, libxl_key_value_list *p); int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, libxl_hwcap *p); +int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p); int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, void *p); int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index fb9baf8..63125dc 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -377,6 +377,45 @@ int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, return 0; } +yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p) +{ + yajl_gen_status s; + int i; + + s = yajl_gen_array_open(hand); + if (s != yajl_gen_status_ok) + return s; + + for (i = 0; i < LIBXL_MS_VM_GENID_LEN; i++) { + s = yajl_gen_integer(hand, p->bytes[i]); + if (s != yajl_gen_status_ok) + return s; + } + + return yajl_gen_array_close(hand); +} + +int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p) +{ + unsigned int i; + + if (!libxl__json_object_is_array(o)) + return ERROR_FAIL; + + for (i = 0; i < LIBXL_MS_VM_GENID_LEN; i++) { + const libxl__json_object *t; + + t = libxl__json_array_get(o, i); + if (!t || !libxl__json_object_is_integer(t)) + return ERROR_FAIL; + + p->bytes[i] = libxl__json_object_get_integer(t); + } + + return 0; +} + yajl_gen_status libxl__string_gen_json(yajl_gen hand, const char *p) { diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h index e4c0f6c..af26e78 100644 --- a/tools/libxl/libxl_json.h +++ b/tools/libxl/libxl_json.h @@ -33,6 +33,7 @@ yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p); yajl_gen_status libxl_key_value_list_gen_json(yajl_gen hand, libxl_key_value_list *p); yajl_gen_status libxl_hwcap_gen_json(yajl_gen hand, libxl_hwcap *p); +yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p); #include <_libxl_types_json.h> diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5607ea7..de25f42 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -17,6 +17,7 @@ libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_d libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE) libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE) # # Specific integer types @@ -378,6 +379,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("xen_platform_pci", libxl_defbool), ("usbdevice_list", libxl_string_list), ("vendor_device", libxl_vendor_device), + # See libxl_ms_vm_genid_generate() + ("ms_vm_genid", libxl_ms_vm_genid), ])), ("pv", Struct(None, [("kernel", string), ("slack_memkb", MemKB), diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5e43831..402e489 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -18,6 +18,7 @@ builtins = { "libxl_string_list": ("string list", "libxl_string_list_val(&%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), "libxl_mac": ("int array", "Mac_val(&%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), + "libxl_ms_vm_genid": ("int array", "Ms_vm_genid_val(&%(c)s, %(o)s)", "Val_ms_vm_genid(&%(c)s)"), # The following needs to be sorted out later "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 8e825ae..4133527 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -370,6 +370,31 @@ static value Val_hwcap(libxl_hwcap *c_val) CAMLreturn(hwcap); } +static value Val_ms_vm_genid (libxl_ms_vm_genid *c_val) +{ + CAMLparam0(); + CAMLlocal1(v); + int i; + + v = caml_alloc_tuple(LIBXL_MS_VM_GENID_LEN); + + for(i=0; ibytes[i])); + + CAMLreturn(v); +} + +static int Ms_vm_genid_val(libxl_ms_vm_genid *c_val, value v) +{ + CAMLparam1(v); + int i; + + for(i=0; ibytes[i] = Int_val(Field(v, i)); + + CAMLreturn(0); +} + static value Val_string_option(const char *c_val) { CAMLparam0(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:52:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCp-0002NM-KC; Sat, 05 Jul 2014 16:52:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCo-0002N1-8U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:54 +0000 Received: from [85.158.139.211:20339] by server-2.bemta-5.messagelabs.com id 4B/38-01647-56D28B35; Sat, 05 Jul 2014 16:52:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404579171!13866949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1525 invoked from network); 5 Jul 2014 16:52:52 -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; 5 Jul 2014 16:52:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCl-0006Jt-JZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCl-0002pj-HB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:51 +0000 Date: Sat, 05 Jul 2014 16:52:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: generate a new random VM generation ID if requested X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f5def4b724e2cd31247246e6dd651e5447f3bdb Author: David Vrabel AuthorDate: Fri Jun 27 14:57:52 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:56:05 2014 +0100 xl: generate a new random VM generation ID if requested If the "generation_id" option is set in the domain configuration, generate and set a new random VM generation ID every time a domain is created or restored. xl lacks the infrastructure to fully track the lifecycle of VM images as they are snapshotted and cloned (etc) so always using a new ID is the safe option and ensures that a new one will be used where it matters. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 29 +++++++++++++++++++++++++++++ tools/libxl/xl_cmdimpl.c | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c087cbc..ff9ea77 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -936,6 +936,35 @@ number of vendor defined SMBIOS structures (type 128 - 255). Since SMBIOS structures do not present their overall size, each entry in the file must be preceded by a 32b integer indicating the size of the next structure. +=item B + +Provide a VM generation ID to the guest. + +The VM generation ID as a 128-bit random number that a guest may use +to determine if the guest has been restored from an earlier snapshot +or cloned. + +This is required for Microsoft Windows Server 2012 (and later) domain +controllers. + +Valid options are: + +=over 4 + +=item B<"generate"> + +Generate a random VM generation ID every time the domain is created or +restored. + +=item B<"none"> + +Do not provide a VM generation ID. + +=back + +See also "Virtual Machine Generation ID" by Microsoft +(http://www.microsoft.com/en-us/download/details.aspx?id=30707). + =back =head3 Guest Virtual Time Controls diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e2d3ad0..68df548 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -983,6 +983,21 @@ static void parse_config_data(const char *config_source, &b_info->u.hvm.smbios_firmware, 0); xlu_cfg_replace_string(config, "acpi_firmware", &b_info->u.hvm.acpi_firmware, 0); + + if (!xlu_cfg_get_string(config, "ms_vm_genid", &buf, 0)) { + if (!strcmp(buf, "generate")) { + e = libxl_ms_vm_genid_generate(ctx, &b_info->u.hvm.ms_vm_genid); + if (e) { + fprintf(stderr, "ERROR: failed to generate a VM Generation ID\n"); + exit(1); + } + } else if (!strcmp(buf, "none")) { + ; + } else { + fprintf(stderr, "ERROR: \"ms_vm_genid\" option must be \"generate\" or \"none\"\n"); + exit(1); + } + } break; case LIBXL_DOMAIN_TYPE_PV: { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:52:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:52: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 1X3TCp-0002NM-KC; Sat, 05 Jul 2014 16:52:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCo-0002N1-8U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:54 +0000 Received: from [85.158.139.211:20339] by server-2.bemta-5.messagelabs.com id 4B/38-01647-56D28B35; Sat, 05 Jul 2014 16:52:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404579171!13866949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1525 invoked from network); 5 Jul 2014 16:52:52 -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; 5 Jul 2014 16:52:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCl-0006Jt-JZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCl-0002pj-HB for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:52:51 +0000 Date: Sat, 05 Jul 2014 16:52:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: generate a new random VM generation ID if requested X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f5def4b724e2cd31247246e6dd651e5447f3bdb Author: David Vrabel AuthorDate: Fri Jun 27 14:57:52 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:56:05 2014 +0100 xl: generate a new random VM generation ID if requested If the "generation_id" option is set in the domain configuration, generate and set a new random VM generation ID every time a domain is created or restored. xl lacks the infrastructure to fully track the lifecycle of VM images as they are snapshotted and cloned (etc) so always using a new ID is the safe option and ensures that a new one will be used where it matters. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 29 +++++++++++++++++++++++++++++ tools/libxl/xl_cmdimpl.c | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c087cbc..ff9ea77 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -936,6 +936,35 @@ number of vendor defined SMBIOS structures (type 128 - 255). Since SMBIOS structures do not present their overall size, each entry in the file must be preceded by a 32b integer indicating the size of the next structure. +=item B + +Provide a VM generation ID to the guest. + +The VM generation ID as a 128-bit random number that a guest may use +to determine if the guest has been restored from an earlier snapshot +or cloned. + +This is required for Microsoft Windows Server 2012 (and later) domain +controllers. + +Valid options are: + +=over 4 + +=item B<"generate"> + +Generate a random VM generation ID every time the domain is created or +restored. + +=item B<"none"> + +Do not provide a VM generation ID. + +=back + +See also "Virtual Machine Generation ID" by Microsoft +(http://www.microsoft.com/en-us/download/details.aspx?id=30707). + =back =head3 Guest Virtual Time Controls diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e2d3ad0..68df548 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -983,6 +983,21 @@ static void parse_config_data(const char *config_source, &b_info->u.hvm.smbios_firmware, 0); xlu_cfg_replace_string(config, "acpi_firmware", &b_info->u.hvm.acpi_firmware, 0); + + if (!xlu_cfg_get_string(config, "ms_vm_genid", &buf, 0)) { + if (!strcmp(buf, "generate")) { + e = libxl_ms_vm_genid_generate(ctx, &b_info->u.hvm.ms_vm_genid); + if (e) { + fprintf(stderr, "ERROR: failed to generate a VM Generation ID\n"); + exit(1); + } + } else if (!strcmp(buf, "none")) { + ; + } else { + fprintf(stderr, "ERROR: \"ms_vm_genid\" option must be \"generate\" or \"none\"\n"); + exit(1); + } + } break; case LIBXL_DOMAIN_TYPE_PV: { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:53:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TCz-0002Oo-Ms; Sat, 05 Jul 2014 16:53:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCy-0002OV-7E for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:04 +0000 Received: from [85.158.139.211:64890] by server-17.bemta-5.messagelabs.com id 39/4A-08711-F6D28B35; Sat, 05 Jul 2014 16:53:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1404579181!8533362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1469 invoked from network); 5 Jul 2014 16:53:02 -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; 5 Jul 2014 16:53:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCv-0006KV-Pr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCv-0002q8-Nk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:01 +0000 Date: Sat, 05 Jul 2014 16:53:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: update docs for the ~/platform/generation-id key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad1746e370e4bd93bf64f555880cae7e68c24531 Author: David Vrabel AuthorDate: Fri Jun 27 14:57:53 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:56:05 2014 +0100 docs: update docs for the ~/platform/generation-id key Signed-off-by: David Vrabel Acked-by: Ian Campbell --- docs/misc/xenstore-paths.markdown | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore-paths.markdown b/docs/misc/xenstore-paths.markdown index 70ab7f4..ea67536 100644 --- a/docs/misc/xenstore-paths.markdown +++ b/docs/misc/xenstore-paths.markdown @@ -166,11 +166,6 @@ use the xenstore-based protocol instead (see ~/control/shutdown, below) even if the guest has advertised support for the event channel protocol. -#### ~/hvmloader/generation-id-address = ADDRESS [r,HVM,INTERNAL] - -The hexadecimal representation of the address of the domain's -"generation id". - #### ~/hvmloader/allow-memory-relocate = ("1"|"0") [HVM,INTERNAL] If the default low MMIO hole (below 4GiB) is not big enough for all @@ -193,9 +188,22 @@ Various platform properties. #### ~/platform/generation-id = INTEGER ":" INTEGER [HVM,INTERNAL] -Two 64 bit values that represent the Windows Generation ID. -Is used by the BIOS initializer to get this value. -If not present or "0:0" (all zeroes) device will not be present to the machine. +The lower and upper 64-bit words of the 128-bit VM Generation ID. + +This key is used by hvmloader to create the ACPI VM Generation ID +device. It initialises a 16 octet region of guest memory with this +value. The guest physical address of this region is saved in the +HVM_PARAM_VM_GENERATION_ID_ADDR HVM parameter. + +If this key is not present, is empty, or is all-zeros ("0:0") then the +ACPI device is not created. + +When restoring a guest, the toolstack may (in certain circumstances) +need generate a new random generation ID and write it to guest memory +at the guest physical address in HVM_PARAM_VM_GENERATION_ID_ADDR. + +See Microsoft's "Virtual Machine Generation ID" specification for the +circumstances where the generation ID needs to be changed. ### Frontend device paths -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:53:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TCz-0002Oo-Ms; Sat, 05 Jul 2014 16:53:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCy-0002OV-7E for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:04 +0000 Received: from [85.158.139.211:64890] by server-17.bemta-5.messagelabs.com id 39/4A-08711-F6D28B35; Sat, 05 Jul 2014 16:53:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1404579181!8533362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1469 invoked from network); 5 Jul 2014 16:53:02 -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; 5 Jul 2014 16:53:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TCv-0006KV-Pr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TCv-0002q8-Nk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:01 +0000 Date: Sat, 05 Jul 2014 16:53:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: update docs for the ~/platform/generation-id key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad1746e370e4bd93bf64f555880cae7e68c24531 Author: David Vrabel AuthorDate: Fri Jun 27 14:57:53 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jun 27 15:56:05 2014 +0100 docs: update docs for the ~/platform/generation-id key Signed-off-by: David Vrabel Acked-by: Ian Campbell --- docs/misc/xenstore-paths.markdown | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore-paths.markdown b/docs/misc/xenstore-paths.markdown index 70ab7f4..ea67536 100644 --- a/docs/misc/xenstore-paths.markdown +++ b/docs/misc/xenstore-paths.markdown @@ -166,11 +166,6 @@ use the xenstore-based protocol instead (see ~/control/shutdown, below) even if the guest has advertised support for the event channel protocol. -#### ~/hvmloader/generation-id-address = ADDRESS [r,HVM,INTERNAL] - -The hexadecimal representation of the address of the domain's -"generation id". - #### ~/hvmloader/allow-memory-relocate = ("1"|"0") [HVM,INTERNAL] If the default low MMIO hole (below 4GiB) is not big enough for all @@ -193,9 +188,22 @@ Various platform properties. #### ~/platform/generation-id = INTEGER ":" INTEGER [HVM,INTERNAL] -Two 64 bit values that represent the Windows Generation ID. -Is used by the BIOS initializer to get this value. -If not present or "0:0" (all zeroes) device will not be present to the machine. +The lower and upper 64-bit words of the 128-bit VM Generation ID. + +This key is used by hvmloader to create the ACPI VM Generation ID +device. It initialises a 16 octet region of guest memory with this +value. The guest physical address of this region is saved in the +HVM_PARAM_VM_GENERATION_ID_ADDR HVM parameter. + +If this key is not present, is empty, or is all-zeros ("0:0") then the +ACPI device is not created. + +When restoring a guest, the toolstack may (in certain circumstances) +need generate a new random generation ID and write it to guest memory +at the guest physical address in HVM_PARAM_VM_GENERATION_ID_ADDR. + +See Microsoft's "Virtual Machine Generation ID" specification for the +circumstances where the generation ID needs to be changed. ### Frontend device paths -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:53:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDA-0002Qs-Pa; Sat, 05 Jul 2014 16:53:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TD8-0002QT-QZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:15 +0000 Received: from [85.158.137.68:58041] by server-3.bemta-3.messagelabs.com id 69/DC-25808-A7D28B35; Sat, 05 Jul 2014 16:53:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404579192!14160736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20881 invoked from network); 5 Jul 2014 16:53:13 -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 Jul 2014 16:53:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TD5-0006Kb-VH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TD5-0002rS-Tc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:11 +0000 Date: Sat, 05 Jul 2014 16:53:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd33987ba27607c3cc7da258cf1d86d21beeb735 Author: Jan Beulich AuthorDate: Mon Jun 30 15:57:40 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 15:57:40 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Sat Jul 05 16:53:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDA-0002Qs-Pa; Sat, 05 Jul 2014 16:53:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TD8-0002QT-QZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:15 +0000 Received: from [85.158.137.68:58041] by server-3.bemta-3.messagelabs.com id 69/DC-25808-A7D28B35; Sat, 05 Jul 2014 16:53:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404579192!14160736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20881 invoked from network); 5 Jul 2014 16:53:13 -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 Jul 2014 16:53:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TD5-0006Kb-VH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TD5-0002rS-Tc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:11 +0000 Date: Sat, 05 Jul 2014 16:53:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd33987ba27607c3cc7da258cf1d86d21beeb735 Author: Jan Beulich AuthorDate: Mon Jun 30 15:57:40 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 15:57:40 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Sat Jul 05 16:53:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDJ-0002SZ-Ui; Sat, 05 Jul 2014 16:53:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDI-0002SJ-Fy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:24 +0000 Received: from [85.158.139.211:21076] by server-8.bemta-5.messagelabs.com id 34/5D-27672-38D28B35; Sat, 05 Jul 2014 16:53:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1404579202!13822231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28519 invoked from network); 5 Jul 2014 16:53:23 -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; 5 Jul 2014 16:53:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDG-0006Kh-4k for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDG-0002rr-38 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:22 +0000 Date: Sat, 05 Jul 2014 16:53:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move alternative.c data fully into .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 eb2952b43a70ae485e297f826212b6b279ca0361 Author: Jan Beulich AuthorDate: Mon Jun 30 16:01:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 16:01:03 2014 +0200 x86: move alternative.c data fully into .init.* This wasn't done upon the initial addition of the file since the section processing needs some adjustment for this: We can't mark the two arrays needing relocations as either __initdata or __initconst, as both have the potential of creating section conflicts (with -fPIC the compiler may want to mark the section writable due to the necessary relocations, colliding with other __initconst uses, and if the compiler chooses to use the provided section name, __initdata on a constant object might collide with other __initdata uses). However, local data known to be referenced only by init code/data can also safely be moved into .init.*. Hence the respective logic is being tweaked such that it won't complain on non-empty .*.local sections. While at it also drop the non-local section names from SPECIAL_DATA_SECTIONS - they can't be safely converted. Signed-off-by: Jan Beulich --- xen/Rules.mk | 3 ++- xen/arch/x86/Makefile | 2 +- xen/arch/x86/alternative.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b0d4634..b49f3c8 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -167,11 +167,12 @@ _clean_%/: FORCE $(CC) $(AFLAGS) -c $< -o $@ SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 8,rodata.str1.$(n)) \ - $(foreach r,rel rel.ro,data.$(r) data.$(r).local) + $(foreach r,rel rel.ro,data.$(r).local) $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' | while read idx name sz rest; do \ case "$$name" in \ + .*.local) ;; \ .text|.text.*|.data|.data.*|.bss) \ test $$sz != 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6c90b1b..c1e244d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -7,7 +7,7 @@ subdir-y += oprofile subdir-$(x86_64) += x86_64 -obj-y += alternative.o +obj-bin-y += alternative.init.o obj-y += apic.o obj-y += bitops.o obj-bin-y += bzimage.init.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index e91fb87..2743792 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -39,7 +39,7 @@ static const unsigned char k8nops[] __initconst = { K8_NOP7, K8_NOP8 }; -static const unsigned char * const k8_nops[ASM_NOP_MAX+1] /*__initconst*/ = { +static const unsigned char * const k8_nops[ASM_NOP_MAX+1] = { NULL, k8nops, k8nops + 1, @@ -63,7 +63,7 @@ static const unsigned char p6nops[] __initconst = { P6_NOP7, P6_NOP8 }; -static const unsigned char * const p6_nops[ASM_NOP_MAX+1] /*__initconst*/ = { +static const unsigned char * const p6_nops[ASM_NOP_MAX+1] = { NULL, p6nops, p6nops + 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 Jul 05 16:53:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDJ-0002SZ-Ui; Sat, 05 Jul 2014 16:53:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDI-0002SJ-Fy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:24 +0000 Received: from [85.158.139.211:21076] by server-8.bemta-5.messagelabs.com id 34/5D-27672-38D28B35; Sat, 05 Jul 2014 16:53:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1404579202!13822231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28519 invoked from network); 5 Jul 2014 16:53:23 -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; 5 Jul 2014 16:53:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDG-0006Kh-4k for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDG-0002rr-38 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:22 +0000 Date: Sat, 05 Jul 2014 16:53:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move alternative.c data fully into .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 eb2952b43a70ae485e297f826212b6b279ca0361 Author: Jan Beulich AuthorDate: Mon Jun 30 16:01:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 16:01:03 2014 +0200 x86: move alternative.c data fully into .init.* This wasn't done upon the initial addition of the file since the section processing needs some adjustment for this: We can't mark the two arrays needing relocations as either __initdata or __initconst, as both have the potential of creating section conflicts (with -fPIC the compiler may want to mark the section writable due to the necessary relocations, colliding with other __initconst uses, and if the compiler chooses to use the provided section name, __initdata on a constant object might collide with other __initdata uses). However, local data known to be referenced only by init code/data can also safely be moved into .init.*. Hence the respective logic is being tweaked such that it won't complain on non-empty .*.local sections. While at it also drop the non-local section names from SPECIAL_DATA_SECTIONS - they can't be safely converted. Signed-off-by: Jan Beulich --- xen/Rules.mk | 3 ++- xen/arch/x86/Makefile | 2 +- xen/arch/x86/alternative.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b0d4634..b49f3c8 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -167,11 +167,12 @@ _clean_%/: FORCE $(CC) $(AFLAGS) -c $< -o $@ SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 8,rodata.str1.$(n)) \ - $(foreach r,rel rel.ro,data.$(r) data.$(r).local) + $(foreach r,rel rel.ro,data.$(r).local) $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' | while read idx name sz rest; do \ case "$$name" in \ + .*.local) ;; \ .text|.text.*|.data|.data.*|.bss) \ test $$sz != 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6c90b1b..c1e244d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -7,7 +7,7 @@ subdir-y += oprofile subdir-$(x86_64) += x86_64 -obj-y += alternative.o +obj-bin-y += alternative.init.o obj-y += apic.o obj-y += bitops.o obj-bin-y += bzimage.init.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index e91fb87..2743792 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -39,7 +39,7 @@ static const unsigned char k8nops[] __initconst = { K8_NOP7, K8_NOP8 }; -static const unsigned char * const k8_nops[ASM_NOP_MAX+1] /*__initconst*/ = { +static const unsigned char * const k8_nops[ASM_NOP_MAX+1] = { NULL, k8nops, k8nops + 1, @@ -63,7 +63,7 @@ static const unsigned char p6nops[] __initconst = { P6_NOP7, P6_NOP8 }; -static const unsigned char * const p6_nops[ASM_NOP_MAX+1] /*__initconst*/ = { +static const unsigned char * const p6_nops[ASM_NOP_MAX+1] = { NULL, p6nops, p6nops + 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 Jul 05 16:53:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDU-0002UB-17; Sat, 05 Jul 2014 16:53:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDS-0002Tt-TN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:35 +0000 Received: from [193.109.254.147:30003] by server-9.bemta-14.messagelabs.com id A9/C6-14237-E8D28B35; Sat, 05 Jul 2014 16:53:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404579212!15638134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10759 invoked from network); 5 Jul 2014 16:53:33 -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; 5 Jul 2014 16:53:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDQ-0006Kp-AK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDQ-0002sE-8b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:32 +0000 Date: Sat, 05 Jul 2014 16:53:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make sgi handling generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aeac0f3d4ce118b3210fdf040d532b6d3d5be472 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:09 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:05 2014 +0100 xen/arm: make sgi handling generic move all the hw specific sgi handling functionality to one function and use it. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 40 ++++++++++++++++++++++++++-------------- xen/include/asm-arm/gic.h | 8 ++++++++ 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 0ca0234..054e1ca 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -483,21 +483,37 @@ void __init gic_init(void) spin_unlock(&gic.lock); } -void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) +static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) { unsigned int mask = 0; cpumask_t online_mask; - ASSERT(sgi < 16); /* There are only 16 SGIs */ + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + GICD[GICD_SGIR] = GICD_SGI_TARGET_OTHERS | sgi; + break; + case SGI_TARGET_SELF: + GICD[GICD_SGIR] = GICD_SGI_TARGET_SELF | sgi; + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gic_cpu_mask(&online_mask); + GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi; + break; + default: + BUG(); + } +} - cpumask_and(&online_mask, cpumask, &cpu_online_map); - mask = gic_cpu_mask(&online_mask); +void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) +{ + ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - - GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST - | (mask< Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDU-0002UB-17; Sat, 05 Jul 2014 16:53:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDS-0002Tt-TN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:35 +0000 Received: from [193.109.254.147:30003] by server-9.bemta-14.messagelabs.com id A9/C6-14237-E8D28B35; Sat, 05 Jul 2014 16:53:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1404579212!15638134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10759 invoked from network); 5 Jul 2014 16:53:33 -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; 5 Jul 2014 16:53:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDQ-0006Kp-AK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDQ-0002sE-8b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:32 +0000 Date: Sat, 05 Jul 2014 16:53:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make sgi handling generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aeac0f3d4ce118b3210fdf040d532b6d3d5be472 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:09 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:05 2014 +0100 xen/arm: make sgi handling generic move all the hw specific sgi handling functionality to one function and use it. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 40 ++++++++++++++++++++++++++-------------- xen/include/asm-arm/gic.h | 8 ++++++++ 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 0ca0234..054e1ca 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -483,21 +483,37 @@ void __init gic_init(void) spin_unlock(&gic.lock); } -void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) +static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) { unsigned int mask = 0; cpumask_t online_mask; - ASSERT(sgi < 16); /* There are only 16 SGIs */ + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + GICD[GICD_SGIR] = GICD_SGI_TARGET_OTHERS | sgi; + break; + case SGI_TARGET_SELF: + GICD[GICD_SGIR] = GICD_SGI_TARGET_SELF | sgi; + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gic_cpu_mask(&online_mask); + GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi; + break; + default: + BUG(); + } +} - cpumask_and(&online_mask, cpumask, &cpu_online_map); - mask = gic_cpu_mask(&online_mask); +void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) +{ + ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - - GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST - | (mask< Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDg-0002W4-46; Sat, 05 Jul 2014 16:53:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDe-0002Vs-BS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:46 +0000 Received: from [85.158.137.68:58753] by server-8.bemta-3.messagelabs.com id C5/16-07166-99D28B35; Sat, 05 Jul 2014 16:53:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404579222!14200078!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19598 invoked from network); 5 Jul 2014 16:53:43 -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 Jul 2014 16:53:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDa-0006Kv-FG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDa-0002sf-Dn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:42 +0000 Date: Sat, 05 Jul 2014 16:53:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use ioremap to map gic-v2 registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 504d05db1b2e98d935f85eedfd40ec7fe263b693 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:10 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: use ioremap to map gic-v2 registers gic-v2 driver uses fixmap to map the registers. Instead use ioremap to access mmio registers. With this patch, gic-v2 register definitions are updated to use absolute offset address instead of dividing the register offset by 4. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 165 ++++++++++++++++++++++++-------------------- xen/arch/arm/vgic.c | 15 ++-- xen/include/asm-arm/gic.h | 102 ++++++++++++++-------------- 3 files changed, 148 insertions(+), 134 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 054e1ca..4ac6da3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -31,20 +31,23 @@ #include #include #include - +#include #include -/* Access to the GIC Distributor registers through the fixmap */ -#define GICD ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICD)) -#define GICC ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICC1)) -#define GICH ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICH)) +#define GICD (gic.map_dbase) +#define GICC (gic.map_cbase) +#define GICH (gic.map_hbase) + static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ static struct { paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ unsigned int lines; /* Number of interrupts (SPIs + PPIs + SGIs) */ unsigned int maintenance_irq; /* IRQ maintenance */ @@ -101,12 +104,12 @@ void gic_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; + v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); v->arch.lr_mask = this_cpu(lr_mask); - v->arch.gic_apr = GICH[GICH_APR]; - v->arch.gic_vmcr = GICH[GICH_VMCR]; + v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); /* Disable until next VCPU scheduled */ - GICH[GICH_HCR] = 0; + writel_relaxed(0, GICH + GICH_HCR); isb(); } @@ -120,10 +123,10 @@ void gic_restore_state(struct vcpu *v) this_cpu(lr_mask) = v->arch.lr_mask; for ( i=0; iarch.gic_lr[i]; - GICH[GICH_APR] = v->arch.gic_apr; - GICH[GICH_VMCR] = v->arch.gic_vmcr; - GICH[GICH_HCR] = GICH_HCR_EN; + writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); isb(); gic_restore_pending_irqs(v); @@ -137,10 +140,10 @@ static void gic_irq_enable(struct irq_desc *desc) ASSERT(spin_is_locked(&desc->lock)); spin_lock_irqsave(&gic.lock, flags); + /* Enable routing */ desc->status &= ~IRQ_DISABLED; dsb(sy); - /* Enable routing */ - GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32)); + writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); spin_unlock_irqrestore(&gic.lock, flags); } @@ -153,7 +156,7 @@ static void gic_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gic.lock, flags); /* Disable routing */ - GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32)); + writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); desc->status |= IRQ_DISABLED; spin_unlock_irqrestore(&gic.lock, flags); } @@ -179,16 +182,16 @@ static void gic_host_irq_end(struct irq_desc *desc) { int irq = desc->irq; /* Lower the priority */ - GICC[GICC_EOIR] = irq; + writel_relaxed(irq, GICC + GICC_EOIR); /* Deactivate */ - GICC[GICC_DIR] = irq; + writel_relaxed(irq, GICC + GICC_DIR); } static void gic_guest_irq_end(struct irq_desc *desc) { int irq = desc->irq; /* Lower the priority of the IRQ */ - GICC[GICC_EOIR] = irq; + writel_relaxed(irq, GICC + GICC_EOIR); /* Deactivation happens in maintenance interrupt / via GICV */ } @@ -229,7 +232,6 @@ static void gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - volatile unsigned char *bytereg; uint32_t cfg, edgebit; unsigned int mask; unsigned int irq = desc->irq; @@ -243,21 +245,18 @@ static void gic_set_irq_properties(struct irq_desc *desc, mask = gic_cpu_mask(cpu_mask); /* Set edge / level */ - cfg = GICD[GICD_ICFGR + irq / 16]; + cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); edgebit = 2u << (2 * (irq % 16)); if ( type & DT_IRQ_TYPE_LEVEL_MASK ) cfg &= ~edgebit; else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) cfg |= edgebit; - GICD[GICD_ICFGR + irq / 16] = cfg; + writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - bytereg = (unsigned char *) (GICD + GICD_ITARGETSR); - bytereg[irq] = mask; - + writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); /* Set priority */ - bytereg = (unsigned char *) (GICD + GICD_IPRIORITYR); - bytereg[irq] = priority; + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); spin_unlock(&gic.lock); } @@ -303,87 +302,94 @@ static void __init gic_dist_init(void) uint32_t cpumask; int i; - cpumask = GICD[GICD_ITARGETSR] & 0xff; + cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; /* Disable the distributor */ - GICD[GICD_CTLR] = 0; + writel_relaxed(0, GICD + GICD_CTLR); - type = GICD[GICD_TYPER]; + type = readl_relaxed(GICD + GICD_TYPER); gic.lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic.cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); printk("GIC: %d lines, %d cpu%s%s (IID %8.8x).\n", gic.lines, gic.cpus, (gic.cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", - GICD[GICD_IIDR]); + readl_relaxed(GICD + GICD_IIDR)); /* Default all global IRQs to level, active low */ for ( i = 32; i < gic.lines; i += 16 ) - GICD[GICD_ICFGR + i / 16] = 0x0; + writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_ITARGETSR + i / 4] = cpumask; + writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_IPRIORITYR + i / 4] = - GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; + writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* Disable all global interrupts */ for ( i = 32; i < gic.lines; i += 32 ) - GICD[GICD_ICENABLER + i / 32] = (uint32_t)~0ul; + writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); /* Turn on the distributor */ - GICD[GICD_CTLR] = GICD_CTL_ENABLE; + writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); } static void __cpuinit gic_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = GICD[GICD_ITARGETSR] & 0xff; + this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ - GICD[GICD_ICENABLER] = 0xffff0000; /* Disable all PPI */ - GICD[GICD_ISENABLER] = 0x0000ffff; /* Enable all SGI */ + writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ + writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + /* 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; + writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* 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; + writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* Local settings: interface controller */ - GICC[GICC_PMR] = 0xff; /* Don't mask by priority */ - GICC[GICC_BPR] = 0; /* Finest granularity of priority */ - GICC[GICC_CTLR] = GICC_CTL_ENABLE|GICC_CTL_EOI; /* Turn on delivery */ + /* Don't mask by priority */ + writel_relaxed(0xff, GICC + GICC_PMR); + /* Finest granularity of priority */ + writel_relaxed(0x0, GICC + GICC_BPR); + /* Turn on delivery */ + writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); } static void gic_cpu_disable(void) { - GICC[GICC_CTLR] = 0; + writel_relaxed(0x0, GICC + GICC_CTLR); } static void __cpuinit gic_hyp_init(void) { uint32_t vtr; - vtr = GICH[GICH_VTR]; + vtr = readl_relaxed(GICH + GICH_VTR); nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; - GICH[GICH_MISR] = GICH_MISR_EOI; + writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); this_cpu(lr_mask) = 0ULL; } static void __cpuinit gic_hyp_disable(void) { - GICH[GICH_HCR] = 0; + writel_relaxed(0, GICH + GICH_HCR); } int gic_irq_xlate(const u32 *intspec, unsigned int intsize, @@ -462,15 +468,21 @@ void __init gic_init(void) (gic.hbase & ~PAGE_MASK) || (gic.vbase & ~PAGE_MASK) ) panic("GIC interfaces not page aligned"); - set_fixmap(FIXMAP_GICD, gic.dbase >> PAGE_SHIFT, DEV_SHARED); - BUILD_BUG_ON(FIXMAP_ADDR(FIXMAP_GICC1) != - FIXMAP_ADDR(FIXMAP_GICC2)-PAGE_SIZE); - set_fixmap(FIXMAP_GICC1, gic.cbase >> PAGE_SHIFT, DEV_SHARED); + gic.map_dbase = ioremap_nocache(gic.dbase, PAGE_SIZE); + if ( !gic.map_dbase ) + panic("Failed to ioremap for GIC distributor\n"); + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - set_fixmap(FIXMAP_GICC2, (gic.cbase >> PAGE_SHIFT) + 0x10, DEV_SHARED); + gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 0x10); else - set_fixmap(FIXMAP_GICC2, (gic.cbase >> PAGE_SHIFT) + 0x1, DEV_SHARED); - set_fixmap(FIXMAP_GICH, gic.hbase >> PAGE_SHIFT, DEV_SHARED); + gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 2); + + if ( !gic.map_cbase ) + panic("Failed to ioremap for GIC CPU interface\n"); + + gic.map_hbase = ioremap_nocache(gic.hbase, PAGE_SIZE); + if ( !gic.map_hbase ) + panic("Failed to ioremap for GIC Virtual interface\n"); /* Global settings: interrupt distributor */ spin_lock_init(&gic.lock); @@ -492,16 +504,17 @@ static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, switch ( irqmode ) { case SGI_TARGET_OTHERS: - GICD[GICD_SGIR] = GICD_SGI_TARGET_OTHERS | sgi; + writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); break; case SGI_TARGET_SELF: - GICD[GICD_SGIR] = GICD_SGI_TARGET_SELF | sgi; + writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); mask = gic_cpu_mask(&online_mask); - GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi; + writel_relaxed(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD + GICD_SGIR); break; default: BUG(); @@ -578,7 +591,7 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, if ( p->desc != NULL ) lr_val |= GICH_LR_HW | (p->desc->irq << GICH_LR_PHYSICAL_SHIFT); - GICH[GICH_LR + lr] = lr_val; + writel_relaxed(lr_val, GICH + GICH_LR + lr * 4); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); @@ -663,7 +676,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) ASSERT(spin_is_locked(&v->arch.vgic.lock)); ASSERT(!local_irq_is_enabled()); - lr = GICH[GICH_LR + i]; + lr = readl_relaxed(GICH + GICH_LR + i * 4); irq = (lr >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; p = irq_to_pending(v, irq); if ( lr & GICH_LR_ACTIVE ) @@ -673,7 +686,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) { if ( p->desc == NULL ) - GICH[GICH_LR + i] = lr | GICH_LR_PENDING; + writel_relaxed(lr | GICH_LR_PENDING, GICH + GICH_LR + i * 4); else gdprintk(XENLOG_WARNING, "unable to inject hw irq=%d into d%dv%d: already active in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); @@ -686,7 +699,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) irq, v->domain->domain_id, v->vcpu_id, i); #endif } else { - GICH[GICH_LR + i] = 0; + writel_relaxed(0, GICH + GICH_LR + i * 4); clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) @@ -794,12 +807,13 @@ int gic_events_need_delivery(void) struct vcpu *v = current; struct pending_irq *p; unsigned long flags; - const unsigned long apr = GICH[GICH_APR]; + const unsigned long apr = readl_relaxed(GICH + GICH_APR); int mask_priority; int active_priority; int rc = 0; - mask_priority = (GICH[GICH_VMCR] >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; + mask_priority = (readl_relaxed(GICH + GICH_VMCR) + >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; active_priority = find_next_bit(&apr, 32, 0); spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -829,22 +843,23 @@ out: void gic_inject(void) { + uint32_t hcr; ASSERT(!local_irq_is_enabled()); gic_restore_pending_irqs(current); + hcr = readl_relaxed(GICH + GICH_HCR); if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) - GICH[GICH_HCR] |= GICH_HCR_UIE; + writel_relaxed(hcr | GICH_HCR_UIE, GICH + GICH_HCR); else - GICH[GICH_HCR] &= ~GICH_HCR_UIE; - + writel_relaxed(hcr & ~GICH_HCR_UIE, GICH + GICH_HCR); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ - GICC[GICC_EOIR] = sgi; + writel_relaxed(sgi, GICC + GICC_EOIR); switch (sgi) { @@ -863,7 +878,7 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) } /* Deactivate */ - GICC[GICC_DIR] = sgi; + writel_relaxed(sgi, GICC + GICC_DIR); } /* Accept an interrupt from the GIC and dispatch its handler */ @@ -874,7 +889,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) do { - intack = GICC[GICC_IAR]; + intack = readl_relaxed(GICC + GICC_IAR); irq = intack & GICC_IA_IRQ; if ( likely(irq >= 16 && irq < 1021) ) @@ -961,7 +976,7 @@ void gic_dump_info(struct vcpu *v) if ( v == current ) { for ( i = 0; i < nr_lrs; i++ ) - printk(" HW_LR[%d]=%x\n", i, GICH[GICH_LR + i]); + printk(" HW_LR[%d]=%x\n", i, readl_relaxed(GICH + GICH_LR + i * 4)); } else { for ( i = 0; i < nr_lrs; i++ ) printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 074d2f3..139c2e9 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -30,7 +30,7 @@ #include #include -#define REG(n) (n/4) +#define REG(n) (n) /* Number of ranks of interrupt registers for a domain */ #define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) @@ -58,7 +58,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) * Offset of GICD_ with its rank, for GICD_ with * -bits-per-interrupt. */ -#define REG_RANK_INDEX(b, n) ((n) & ((b)-1)) +#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) /* * Returns rank corresponding to a GICD_ register for @@ -66,7 +66,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) */ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) { - int rank = REG_RANK_NR(b, n); + int rank = REG_RANK_NR(b, (n >> 2)); if ( rank == 0 ) return &v->arch.vgic.private_irqs; @@ -78,7 +78,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq >> 2); + return vgic_rank_offset(v, 8, irq); } static const struct mmio_handler_ops vgic_distr_mmio_handler = { @@ -552,7 +552,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); + vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> 2); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -563,7 +563,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) tr = rank->ienable; rank->ienable &= ~*r; vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER); + vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> 2); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -725,7 +725,6 @@ void vgic_clear_pending_irqs(struct vcpu *v) void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) { - int idx = irq >> 2, byte = irq & 0x3; uint8_t priority; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); struct pending_irq *iter, *n = irq_to_pending(v, irq); @@ -748,7 +747,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, idx)], 0, byte); + priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index c7b7368..7fa3b95 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -18,37 +18,37 @@ #ifndef __ASM_ARM_GIC_H__ #define __ASM_ARM_GIC_H__ -#define GICD_CTLR (0x000/4) -#define GICD_TYPER (0x004/4) -#define GICD_IIDR (0x008/4) -#define GICD_IGROUPR (0x080/4) -#define GICD_IGROUPRN (0x0FC/4) -#define GICD_ISENABLER (0x100/4) -#define GICD_ISENABLERN (0x17C/4) -#define GICD_ICENABLER (0x180/4) -#define GICD_ICENABLERN (0x1fC/4) -#define GICD_ISPENDR (0x200/4) -#define GICD_ISPENDRN (0x27C/4) -#define GICD_ICPENDR (0x280/4) -#define GICD_ICPENDRN (0x2FC/4) -#define GICD_ISACTIVER (0x300/4) -#define GICD_ISACTIVERN (0x37C/4) -#define GICD_ICACTIVER (0x380/4) -#define GICD_ICACTIVERN (0x3FC/4) -#define GICD_IPRIORITYR (0x400/4) -#define GICD_IPRIORITYRN (0x7F8/4) -#define GICD_ITARGETSR (0x800/4) -#define GICD_ITARGETSRN (0xBF8/4) -#define GICD_ICFGR (0xC00/4) -#define GICD_ICFGRN (0xCFC/4) -#define GICD_NSACR (0xE00/4) -#define GICD_NSACRN (0xEFC/4) -#define GICD_SGIR (0xF00/4) -#define GICD_CPENDSGIR (0xF10/4) -#define GICD_CPENDSGIRN (0xF1C/4) -#define GICD_SPENDSGIR (0xF20/4) -#define GICD_SPENDSGIRN (0xF2C/4) -#define GICD_ICPIDR2 (0xFE8/4) +#define GICD_CTLR (0x000) +#define GICD_TYPER (0x004) +#define GICD_IIDR (0x008) +#define GICD_IGROUPR (0x080) +#define GICD_IGROUPRN (0x0FC) +#define GICD_ISENABLER (0x100) +#define GICD_ISENABLERN (0x17C) +#define GICD_ICENABLER (0x180) +#define GICD_ICENABLERN (0x1fC) +#define GICD_ISPENDR (0x200) +#define GICD_ISPENDRN (0x27C) +#define GICD_ICPENDR (0x280) +#define GICD_ICPENDRN (0x2FC) +#define GICD_ISACTIVER (0x300) +#define GICD_ISACTIVERN (0x37C) +#define GICD_ICACTIVER (0x380) +#define GICD_ICACTIVERN (0x3FC) +#define GICD_IPRIORITYR (0x400) +#define GICD_IPRIORITYRN (0x7F8) +#define GICD_ITARGETSR (0x800) +#define GICD_ITARGETSRN (0xBF8) +#define GICD_ICFGR (0xC00) +#define GICD_ICFGRN (0xCFC) +#define GICD_NSACR (0xE00) +#define GICD_NSACRN (0xEFC) +#define GICD_SGIR (0xF00) +#define GICD_CPENDSGIR (0xF10) +#define GICD_CPENDSGIRN (0xF1C) +#define GICD_SPENDSGIR (0xF20) +#define GICD_SPENDSGIRN (0xF2C) +#define GICD_ICPIDR2 (0xFE8) #define GICD_SGI_TARGET_LIST_SHIFT (24) #define GICD_SGI_TARGET_LIST_MASK (0x3UL << GICD_SGI_TARGET_LIST_SHIFT) @@ -60,27 +60,27 @@ #define GICD_SGI_GROUP1 (1UL<<15) #define GICD_SGI_INTID_MASK (0xFUL) -#define GICC_CTLR (0x0000/4) -#define GICC_PMR (0x0004/4) -#define GICC_BPR (0x0008/4) -#define GICC_IAR (0x000C/4) -#define GICC_EOIR (0x0010/4) -#define GICC_RPR (0x0014/4) -#define GICC_HPPIR (0x0018/4) -#define GICC_APR (0x00D0/4) -#define GICC_NSAPR (0x00E0/4) -#define GICC_DIR (0x1000/4) - -#define GICH_HCR (0x00/4) -#define GICH_VTR (0x04/4) -#define GICH_VMCR (0x08/4) -#define GICH_MISR (0x10/4) -#define GICH_EISR0 (0x20/4) -#define GICH_EISR1 (0x24/4) -#define GICH_ELSR0 (0x30/4) -#define GICH_ELSR1 (0x34/4) -#define GICH_APR (0xF0/4) -#define GICH_LR (0x100/4) +#define GICC_CTLR (0x0000) +#define GICC_PMR (0x0004) +#define GICC_BPR (0x0008) +#define GICC_IAR (0x000C) +#define GICC_EOIR (0x0010) +#define GICC_RPR (0x0014) +#define GICC_HPPIR (0x0018) +#define GICC_APR (0x00D0) +#define GICC_NSAPR (0x00E0) +#define GICC_DIR (0x1000) + +#define GICH_HCR (0x00) +#define GICH_VTR (0x04) +#define GICH_VMCR (0x08) +#define GICH_MISR (0x10) +#define GICH_EISR0 (0x20) +#define GICH_EISR1 (0x24) +#define GICH_ELSR0 (0x30) +#define GICH_ELSR1 (0x34) +#define GICH_APR (0xF0) +#define GICH_LR (0x100) /* Register bits */ #define GICD_CTL_ENABLE 0x1 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:53:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDg-0002W4-46; Sat, 05 Jul 2014 16:53:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDe-0002Vs-BS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:46 +0000 Received: from [85.158.137.68:58753] by server-8.bemta-3.messagelabs.com id C5/16-07166-99D28B35; Sat, 05 Jul 2014 16:53:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1404579222!14200078!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19598 invoked from network); 5 Jul 2014 16:53:43 -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 Jul 2014 16:53:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDa-0006Kv-FG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDa-0002sf-Dn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:42 +0000 Date: Sat, 05 Jul 2014 16:53:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use ioremap to map gic-v2 registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 504d05db1b2e98d935f85eedfd40ec7fe263b693 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:10 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: use ioremap to map gic-v2 registers gic-v2 driver uses fixmap to map the registers. Instead use ioremap to access mmio registers. With this patch, gic-v2 register definitions are updated to use absolute offset address instead of dividing the register offset by 4. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 165 ++++++++++++++++++++++++-------------------- xen/arch/arm/vgic.c | 15 ++-- xen/include/asm-arm/gic.h | 102 ++++++++++++++-------------- 3 files changed, 148 insertions(+), 134 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 054e1ca..4ac6da3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -31,20 +31,23 @@ #include #include #include - +#include #include -/* Access to the GIC Distributor registers through the fixmap */ -#define GICD ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICD)) -#define GICC ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICC1)) -#define GICH ((volatile uint32_t *) FIXMAP_ADDR(FIXMAP_GICH)) +#define GICD (gic.map_dbase) +#define GICC (gic.map_cbase) +#define GICH (gic.map_hbase) + static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ static struct { paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ unsigned int lines; /* Number of interrupts (SPIs + PPIs + SGIs) */ unsigned int maintenance_irq; /* IRQ maintenance */ @@ -101,12 +104,12 @@ void gic_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; + v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); v->arch.lr_mask = this_cpu(lr_mask); - v->arch.gic_apr = GICH[GICH_APR]; - v->arch.gic_vmcr = GICH[GICH_VMCR]; + v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); /* Disable until next VCPU scheduled */ - GICH[GICH_HCR] = 0; + writel_relaxed(0, GICH + GICH_HCR); isb(); } @@ -120,10 +123,10 @@ void gic_restore_state(struct vcpu *v) this_cpu(lr_mask) = v->arch.lr_mask; for ( i=0; iarch.gic_lr[i]; - GICH[GICH_APR] = v->arch.gic_apr; - GICH[GICH_VMCR] = v->arch.gic_vmcr; - GICH[GICH_HCR] = GICH_HCR_EN; + writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); isb(); gic_restore_pending_irqs(v); @@ -137,10 +140,10 @@ static void gic_irq_enable(struct irq_desc *desc) ASSERT(spin_is_locked(&desc->lock)); spin_lock_irqsave(&gic.lock, flags); + /* Enable routing */ desc->status &= ~IRQ_DISABLED; dsb(sy); - /* Enable routing */ - GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32)); + writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); spin_unlock_irqrestore(&gic.lock, flags); } @@ -153,7 +156,7 @@ static void gic_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gic.lock, flags); /* Disable routing */ - GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32)); + writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); desc->status |= IRQ_DISABLED; spin_unlock_irqrestore(&gic.lock, flags); } @@ -179,16 +182,16 @@ static void gic_host_irq_end(struct irq_desc *desc) { int irq = desc->irq; /* Lower the priority */ - GICC[GICC_EOIR] = irq; + writel_relaxed(irq, GICC + GICC_EOIR); /* Deactivate */ - GICC[GICC_DIR] = irq; + writel_relaxed(irq, GICC + GICC_DIR); } static void gic_guest_irq_end(struct irq_desc *desc) { int irq = desc->irq; /* Lower the priority of the IRQ */ - GICC[GICC_EOIR] = irq; + writel_relaxed(irq, GICC + GICC_EOIR); /* Deactivation happens in maintenance interrupt / via GICV */ } @@ -229,7 +232,6 @@ static void gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - volatile unsigned char *bytereg; uint32_t cfg, edgebit; unsigned int mask; unsigned int irq = desc->irq; @@ -243,21 +245,18 @@ static void gic_set_irq_properties(struct irq_desc *desc, mask = gic_cpu_mask(cpu_mask); /* Set edge / level */ - cfg = GICD[GICD_ICFGR + irq / 16]; + cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); edgebit = 2u << (2 * (irq % 16)); if ( type & DT_IRQ_TYPE_LEVEL_MASK ) cfg &= ~edgebit; else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) cfg |= edgebit; - GICD[GICD_ICFGR + irq / 16] = cfg; + writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - bytereg = (unsigned char *) (GICD + GICD_ITARGETSR); - bytereg[irq] = mask; - + writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); /* Set priority */ - bytereg = (unsigned char *) (GICD + GICD_IPRIORITYR); - bytereg[irq] = priority; + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); spin_unlock(&gic.lock); } @@ -303,87 +302,94 @@ static void __init gic_dist_init(void) uint32_t cpumask; int i; - cpumask = GICD[GICD_ITARGETSR] & 0xff; + cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; /* Disable the distributor */ - GICD[GICD_CTLR] = 0; + writel_relaxed(0, GICD + GICD_CTLR); - type = GICD[GICD_TYPER]; + type = readl_relaxed(GICD + GICD_TYPER); gic.lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic.cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); printk("GIC: %d lines, %d cpu%s%s (IID %8.8x).\n", gic.lines, gic.cpus, (gic.cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", - GICD[GICD_IIDR]); + readl_relaxed(GICD + GICD_IIDR)); /* Default all global IRQs to level, active low */ for ( i = 32; i < gic.lines; i += 16 ) - GICD[GICD_ICFGR + i / 16] = 0x0; + writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_ITARGETSR + i / 4] = cpumask; + writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_IPRIORITYR + i / 4] = - GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; + writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* Disable all global interrupts */ for ( i = 32; i < gic.lines; i += 32 ) - GICD[GICD_ICENABLER + i / 32] = (uint32_t)~0ul; + writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); /* Turn on the distributor */ - GICD[GICD_CTLR] = GICD_CTL_ENABLE; + writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); } static void __cpuinit gic_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = GICD[GICD_ITARGETSR] & 0xff; + this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ - GICD[GICD_ICENABLER] = 0xffff0000; /* Disable all PPI */ - GICD[GICD_ISENABLER] = 0x0000ffff; /* Enable all SGI */ + writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ + writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + /* 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; + writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* 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; + writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); /* Local settings: interface controller */ - GICC[GICC_PMR] = 0xff; /* Don't mask by priority */ - GICC[GICC_BPR] = 0; /* Finest granularity of priority */ - GICC[GICC_CTLR] = GICC_CTL_ENABLE|GICC_CTL_EOI; /* Turn on delivery */ + /* Don't mask by priority */ + writel_relaxed(0xff, GICC + GICC_PMR); + /* Finest granularity of priority */ + writel_relaxed(0x0, GICC + GICC_BPR); + /* Turn on delivery */ + writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); } static void gic_cpu_disable(void) { - GICC[GICC_CTLR] = 0; + writel_relaxed(0x0, GICC + GICC_CTLR); } static void __cpuinit gic_hyp_init(void) { uint32_t vtr; - vtr = GICH[GICH_VTR]; + vtr = readl_relaxed(GICH + GICH_VTR); nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; - GICH[GICH_MISR] = GICH_MISR_EOI; + writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); this_cpu(lr_mask) = 0ULL; } static void __cpuinit gic_hyp_disable(void) { - GICH[GICH_HCR] = 0; + writel_relaxed(0, GICH + GICH_HCR); } int gic_irq_xlate(const u32 *intspec, unsigned int intsize, @@ -462,15 +468,21 @@ void __init gic_init(void) (gic.hbase & ~PAGE_MASK) || (gic.vbase & ~PAGE_MASK) ) panic("GIC interfaces not page aligned"); - set_fixmap(FIXMAP_GICD, gic.dbase >> PAGE_SHIFT, DEV_SHARED); - BUILD_BUG_ON(FIXMAP_ADDR(FIXMAP_GICC1) != - FIXMAP_ADDR(FIXMAP_GICC2)-PAGE_SIZE); - set_fixmap(FIXMAP_GICC1, gic.cbase >> PAGE_SHIFT, DEV_SHARED); + gic.map_dbase = ioremap_nocache(gic.dbase, PAGE_SIZE); + if ( !gic.map_dbase ) + panic("Failed to ioremap for GIC distributor\n"); + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - set_fixmap(FIXMAP_GICC2, (gic.cbase >> PAGE_SHIFT) + 0x10, DEV_SHARED); + gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 0x10); else - set_fixmap(FIXMAP_GICC2, (gic.cbase >> PAGE_SHIFT) + 0x1, DEV_SHARED); - set_fixmap(FIXMAP_GICH, gic.hbase >> PAGE_SHIFT, DEV_SHARED); + gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 2); + + if ( !gic.map_cbase ) + panic("Failed to ioremap for GIC CPU interface\n"); + + gic.map_hbase = ioremap_nocache(gic.hbase, PAGE_SIZE); + if ( !gic.map_hbase ) + panic("Failed to ioremap for GIC Virtual interface\n"); /* Global settings: interrupt distributor */ spin_lock_init(&gic.lock); @@ -492,16 +504,17 @@ static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, switch ( irqmode ) { case SGI_TARGET_OTHERS: - GICD[GICD_SGIR] = GICD_SGI_TARGET_OTHERS | sgi; + writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); break; case SGI_TARGET_SELF: - GICD[GICD_SGIR] = GICD_SGI_TARGET_SELF | sgi; + writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); mask = gic_cpu_mask(&online_mask); - GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi; + writel_relaxed(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD + GICD_SGIR); break; default: BUG(); @@ -578,7 +591,7 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, if ( p->desc != NULL ) lr_val |= GICH_LR_HW | (p->desc->irq << GICH_LR_PHYSICAL_SHIFT); - GICH[GICH_LR + lr] = lr_val; + writel_relaxed(lr_val, GICH + GICH_LR + lr * 4); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); @@ -663,7 +676,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) ASSERT(spin_is_locked(&v->arch.vgic.lock)); ASSERT(!local_irq_is_enabled()); - lr = GICH[GICH_LR + i]; + lr = readl_relaxed(GICH + GICH_LR + i * 4); irq = (lr >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; p = irq_to_pending(v, irq); if ( lr & GICH_LR_ACTIVE ) @@ -673,7 +686,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) { if ( p->desc == NULL ) - GICH[GICH_LR + i] = lr | GICH_LR_PENDING; + writel_relaxed(lr | GICH_LR_PENDING, GICH + GICH_LR + i * 4); else gdprintk(XENLOG_WARNING, "unable to inject hw irq=%d into d%dv%d: already active in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); @@ -686,7 +699,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) irq, v->domain->domain_id, v->vcpu_id, i); #endif } else { - GICH[GICH_LR + i] = 0; + writel_relaxed(0, GICH + GICH_LR + i * 4); clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) @@ -794,12 +807,13 @@ int gic_events_need_delivery(void) struct vcpu *v = current; struct pending_irq *p; unsigned long flags; - const unsigned long apr = GICH[GICH_APR]; + const unsigned long apr = readl_relaxed(GICH + GICH_APR); int mask_priority; int active_priority; int rc = 0; - mask_priority = (GICH[GICH_VMCR] >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; + mask_priority = (readl_relaxed(GICH + GICH_VMCR) + >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; active_priority = find_next_bit(&apr, 32, 0); spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -829,22 +843,23 @@ out: void gic_inject(void) { + uint32_t hcr; ASSERT(!local_irq_is_enabled()); gic_restore_pending_irqs(current); + hcr = readl_relaxed(GICH + GICH_HCR); if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) - GICH[GICH_HCR] |= GICH_HCR_UIE; + writel_relaxed(hcr | GICH_HCR_UIE, GICH + GICH_HCR); else - GICH[GICH_HCR] &= ~GICH_HCR_UIE; - + writel_relaxed(hcr & ~GICH_HCR_UIE, GICH + GICH_HCR); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ - GICC[GICC_EOIR] = sgi; + writel_relaxed(sgi, GICC + GICC_EOIR); switch (sgi) { @@ -863,7 +878,7 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) } /* Deactivate */ - GICC[GICC_DIR] = sgi; + writel_relaxed(sgi, GICC + GICC_DIR); } /* Accept an interrupt from the GIC and dispatch its handler */ @@ -874,7 +889,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) do { - intack = GICC[GICC_IAR]; + intack = readl_relaxed(GICC + GICC_IAR); irq = intack & GICC_IA_IRQ; if ( likely(irq >= 16 && irq < 1021) ) @@ -961,7 +976,7 @@ void gic_dump_info(struct vcpu *v) if ( v == current ) { for ( i = 0; i < nr_lrs; i++ ) - printk(" HW_LR[%d]=%x\n", i, GICH[GICH_LR + i]); + printk(" HW_LR[%d]=%x\n", i, readl_relaxed(GICH + GICH_LR + i * 4)); } else { for ( i = 0; i < nr_lrs; i++ ) printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 074d2f3..139c2e9 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -30,7 +30,7 @@ #include #include -#define REG(n) (n/4) +#define REG(n) (n) /* Number of ranks of interrupt registers for a domain */ #define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) @@ -58,7 +58,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) * Offset of GICD_ with its rank, for GICD_ with * -bits-per-interrupt. */ -#define REG_RANK_INDEX(b, n) ((n) & ((b)-1)) +#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) /* * Returns rank corresponding to a GICD_ register for @@ -66,7 +66,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) */ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) { - int rank = REG_RANK_NR(b, n); + int rank = REG_RANK_NR(b, (n >> 2)); if ( rank == 0 ) return &v->arch.vgic.private_irqs; @@ -78,7 +78,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq >> 2); + return vgic_rank_offset(v, 8, irq); } static const struct mmio_handler_ops vgic_distr_mmio_handler = { @@ -552,7 +552,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); + vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> 2); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -563,7 +563,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) tr = rank->ienable; rank->ienable &= ~*r; vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER); + vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> 2); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -725,7 +725,6 @@ void vgic_clear_pending_irqs(struct vcpu *v) void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) { - int idx = irq >> 2, byte = irq & 0x3; uint8_t priority; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); struct pending_irq *iter, *n = irq_to_pending(v, irq); @@ -748,7 +747,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, idx)], 0, byte); + priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index c7b7368..7fa3b95 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -18,37 +18,37 @@ #ifndef __ASM_ARM_GIC_H__ #define __ASM_ARM_GIC_H__ -#define GICD_CTLR (0x000/4) -#define GICD_TYPER (0x004/4) -#define GICD_IIDR (0x008/4) -#define GICD_IGROUPR (0x080/4) -#define GICD_IGROUPRN (0x0FC/4) -#define GICD_ISENABLER (0x100/4) -#define GICD_ISENABLERN (0x17C/4) -#define GICD_ICENABLER (0x180/4) -#define GICD_ICENABLERN (0x1fC/4) -#define GICD_ISPENDR (0x200/4) -#define GICD_ISPENDRN (0x27C/4) -#define GICD_ICPENDR (0x280/4) -#define GICD_ICPENDRN (0x2FC/4) -#define GICD_ISACTIVER (0x300/4) -#define GICD_ISACTIVERN (0x37C/4) -#define GICD_ICACTIVER (0x380/4) -#define GICD_ICACTIVERN (0x3FC/4) -#define GICD_IPRIORITYR (0x400/4) -#define GICD_IPRIORITYRN (0x7F8/4) -#define GICD_ITARGETSR (0x800/4) -#define GICD_ITARGETSRN (0xBF8/4) -#define GICD_ICFGR (0xC00/4) -#define GICD_ICFGRN (0xCFC/4) -#define GICD_NSACR (0xE00/4) -#define GICD_NSACRN (0xEFC/4) -#define GICD_SGIR (0xF00/4) -#define GICD_CPENDSGIR (0xF10/4) -#define GICD_CPENDSGIRN (0xF1C/4) -#define GICD_SPENDSGIR (0xF20/4) -#define GICD_SPENDSGIRN (0xF2C/4) -#define GICD_ICPIDR2 (0xFE8/4) +#define GICD_CTLR (0x000) +#define GICD_TYPER (0x004) +#define GICD_IIDR (0x008) +#define GICD_IGROUPR (0x080) +#define GICD_IGROUPRN (0x0FC) +#define GICD_ISENABLER (0x100) +#define GICD_ISENABLERN (0x17C) +#define GICD_ICENABLER (0x180) +#define GICD_ICENABLERN (0x1fC) +#define GICD_ISPENDR (0x200) +#define GICD_ISPENDRN (0x27C) +#define GICD_ICPENDR (0x280) +#define GICD_ICPENDRN (0x2FC) +#define GICD_ISACTIVER (0x300) +#define GICD_ISACTIVERN (0x37C) +#define GICD_ICACTIVER (0x380) +#define GICD_ICACTIVERN (0x3FC) +#define GICD_IPRIORITYR (0x400) +#define GICD_IPRIORITYRN (0x7F8) +#define GICD_ITARGETSR (0x800) +#define GICD_ITARGETSRN (0xBF8) +#define GICD_ICFGR (0xC00) +#define GICD_ICFGRN (0xCFC) +#define GICD_NSACR (0xE00) +#define GICD_NSACRN (0xEFC) +#define GICD_SGIR (0xF00) +#define GICD_CPENDSGIR (0xF10) +#define GICD_CPENDSGIRN (0xF1C) +#define GICD_SPENDSGIR (0xF20) +#define GICD_SPENDSGIRN (0xF2C) +#define GICD_ICPIDR2 (0xFE8) #define GICD_SGI_TARGET_LIST_SHIFT (24) #define GICD_SGI_TARGET_LIST_MASK (0x3UL << GICD_SGI_TARGET_LIST_SHIFT) @@ -60,27 +60,27 @@ #define GICD_SGI_GROUP1 (1UL<<15) #define GICD_SGI_INTID_MASK (0xFUL) -#define GICC_CTLR (0x0000/4) -#define GICC_PMR (0x0004/4) -#define GICC_BPR (0x0008/4) -#define GICC_IAR (0x000C/4) -#define GICC_EOIR (0x0010/4) -#define GICC_RPR (0x0014/4) -#define GICC_HPPIR (0x0018/4) -#define GICC_APR (0x00D0/4) -#define GICC_NSAPR (0x00E0/4) -#define GICC_DIR (0x1000/4) - -#define GICH_HCR (0x00/4) -#define GICH_VTR (0x04/4) -#define GICH_VMCR (0x08/4) -#define GICH_MISR (0x10/4) -#define GICH_EISR0 (0x20/4) -#define GICH_EISR1 (0x24/4) -#define GICH_ELSR0 (0x30/4) -#define GICH_ELSR1 (0x34/4) -#define GICH_APR (0xF0/4) -#define GICH_LR (0x100/4) +#define GICC_CTLR (0x0000) +#define GICC_PMR (0x0004) +#define GICC_BPR (0x0008) +#define GICC_IAR (0x000C) +#define GICC_EOIR (0x0010) +#define GICC_RPR (0x0014) +#define GICC_HPPIR (0x0018) +#define GICC_APR (0x00D0) +#define GICC_NSAPR (0x00E0) +#define GICC_DIR (0x1000) + +#define GICH_HCR (0x00) +#define GICH_VTR (0x04) +#define GICH_VMCR (0x08) +#define GICH_MISR (0x10) +#define GICH_EISR0 (0x20) +#define GICH_EISR1 (0x24) +#define GICH_ELSR0 (0x30) +#define GICH_ELSR1 (0x34) +#define GICH_APR (0xF0) +#define GICH_LR (0x100) /* Register bits */ #define GICD_CTL_ENABLE 0x1 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:53:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDq-0002Xj-AH; Sat, 05 Jul 2014 16:53:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDp-0002XZ-JT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:58 +0000 Received: from [85.158.137.68:62754] by server-12.bemta-3.messagelabs.com id E3/73-12714-4AD28B35; Sat, 05 Jul 2014 16:53:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404579232!14244281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32256 invoked from network); 5 Jul 2014 16:53:53 -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; 5 Jul 2014 16:53:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDk-0006L4-Ky for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDk-0002t1-Im for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:52 +0000 Date: Sat, 05 Jul 2014 16:53:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: segregate and split GIC low level functionality X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee65c871ea16ca0e242df7fadebd53ac05dd2e91 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:11 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: segregate and split GIC low level functionality GIC driver contains both generic and hardware specific low level functionality in gic.c file. With this patch, low level functionality is moved to separate file gic-v2.c and generic code is kept in gic.c file Callbacks are registered by low level driver with generic driver and are called wherever required. The locking mechanism is not changed. This helps to separate generic and hardware functionality and implement future hardware version drivers. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Julien Grall Tested-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/gic-v2.c | 679 +++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic.c | 546 +++++------------------------------- xen/include/asm-arm/gic.h | 107 ++++++-- 4 files changed, 837 insertions(+), 497 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 63e0460..969ee52 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -10,7 +10,7 @@ obj-y += vpsci.o obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o -obj-y += gic.o +obj-y += gic.o gic-v2.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c new file mode 100644 index 0000000..3539cb8 --- /dev/null +++ b/xen/arch/arm/gic-v2.c @@ -0,0 +1,679 @@ +/* + * xen/arch/arm/gic-v2.c + * + * ARM Generic Interrupt Controller support v2 + * + * Tim Deegan + * Copyright (c) 2011 Citrix Systems. + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* + * LR register definitions are GIC v2 specific. + * Moved these definitions from header file to here + */ +#define GICH_V2_LR_VIRTUAL_MASK 0x3ff +#define GICH_V2_LR_VIRTUAL_SHIFT 0 +#define GICH_V2_LR_PHYSICAL_MASK 0x3ff +#define GICH_V2_LR_PHYSICAL_SHIFT 10 +#define GICH_V2_LR_STATE_MASK 0x3 +#define GICH_V2_LR_STATE_SHIFT 28 +#define GICH_V2_LR_PRIORITY_SHIFT 23 +#define GICH_V2_LR_PRIORITY_MASK 0x1f +#define GICH_V2_LR_HW_SHIFT 31 +#define GICH_V2_LR_HW_MASK 0x1 +#define GICH_V2_LR_GRP_SHIFT 30 +#define GICH_V2_LR_GRP_MASK 0x1 +#define GICH_V2_LR_MAINTENANCE_IRQ (1<<19) +#define GICH_V2_LR_GRP1 (1<<30) +#define GICH_V2_LR_HW (1<<31) +#define GICH_V2_LR_CPUID_SHIFT 9 +#define GICH_V2_VTR_NRLRGS 0x3f + +#define GICH_V2_VMCR_PRIORITY_MASK 0x1f +#define GICH_V2_VMCR_PRIORITY_SHIFT 27 + +#define GICD (gicv2.map_dbase) +#define GICC (gicv2.map_cbase) +#define GICH (gicv2.map_hbase) + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ + paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ + paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ + paddr_t vbase; /* Address of virtual cpu interface registers */ + spinlock_t lock; +} gicv2; + +static struct gic_info gicv2_info; + +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu( cpu, &possible_mask ) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + +static void gicv2_save_state(struct vcpu *v) +{ + int i; + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + */ + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + + v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); + /* Disable until next VCPU scheduled */ + writel_relaxed(0, GICH + GICH_HCR); +} + +static void gicv2_restore_state(const struct vcpu *v) +{ + int i; + + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + + writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); +} + +static void gicv2_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%x\n", i, + readl_relaxed(GICH + GICH_LR + i * 4)); + } + else + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); + } +} + +static void gicv2_eoi_irq(struct irq_desc *irqd) +{ + int irq = irqd->irq; + /* Lower the priority */ + writel_relaxed(irq, GICC + GICC_EOIR); +} + +static void gicv2_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + writel_relaxed(irqd->irq, GICC + GICC_DIR); +} + +static unsigned int gicv2_read_irq(void) +{ + return (readl_relaxed(GICC + GICC_IAR) & GICC_IA_IRQ); +} + +/* + * needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ +static void gicv2_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, edgebit; + unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + ASSERT(type != DT_IRQ_TYPE_INVALID); + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock(&gicv2.lock); + /* Set edge / level */ + cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); + /* Set priority */ + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + + spin_unlock(&gicv2.lock); +} + +static void __init gicv2_dist_init(void) +{ + uint32_t type; + uint32_t cpumask; + uint32_t gic_cpus; + int i; + + cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + cpumask |= cpumask << 8; + cpumask |= cpumask << 16; + + /* Disable the distributor */ + writel_relaxed(0, GICD + GICD_CTLR); + + type = readl_relaxed(GICD + GICD_TYPER); + gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + (type & GICD_TYPE_SEC) ? ", secure" : "", + readl_relaxed(GICD + GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); + + /* Route all global IRQs to this CPU */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); + + /* Default priority for global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Disable all global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) + writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); + + /* Turn on the distributor */ + writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); +} + +static void __cpuinit gicv2_cpu_init(void) +{ + int i; + + this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so + * even though they are controlled with GICD registers, they must + * be set up here with the other per-cpu state. */ + writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ + writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + + /* Set SGI priorities */ + for ( i = 0; i < 16; i += 4 ) + writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Set PPI priorities */ + for ( i = 16; i < 32; i += 4 ) + writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Local settings: interface controller */ + /* Don't mask by priority */ + writel_relaxed(0xff, GICC + GICC_PMR); + /* Finest granularity of priority */ + writel_relaxed(0x0, GICC + GICC_BPR); + /* Turn on delivery */ + writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); +} + +static void gicv2_cpu_disable(void) +{ + writel_relaxed(0x0, GICC + GICC_CTLR); +} + +static void __cpuinit gicv2_hyp_init(void) +{ + uint32_t vtr; + uint8_t nr_lrs; + + vtr = readl_relaxed(GICH + GICH_VTR); + nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; + gicv2_info.nr_lrs = nr_lrs; + + writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); +} + +static void __cpuinit gicv2_hyp_disable(void) +{ + writel_relaxed(0, GICH + GICH_HCR); +} + +static int gicv2_secondary_cpu_init(void) +{ + spin_lock(&gicv2.lock); + + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + return 0; +} + +static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) +{ + unsigned int mask = 0; + cpumask_t online_mask; + + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); + break; + case SGI_TARGET_SELF: + writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gicv2_cpu_mask(&online_mask); + writel_relaxed(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD + GICD_SGIR); + break; + default: + BUG(); + } +} + +/* Shut down the per-CPU GIC interface */ +static void gicv2_disable_interface(void) +{ + spin_lock(&gicv2.lock); + gicv2_cpu_disable(); + gicv2_hyp_disable(); + spin_unlock(&gicv2.lock); +} + +static void gicv2_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint32_t lr_reg; + + BUG_ON(lr >= gicv2_info.nr_lrs); + BUG_ON(lr < 0); + + lr_reg = (((state & GICH_V2_LR_STATE_MASK) << GICH_V2_LR_STATE_SHIFT) | + ((GIC_PRI_TO_GUEST(p->priority) & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); + + if ( p->desc != NULL ) + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); + + writel_relaxed(lr_reg, GICH + GICH_LR + lr * 4); +} + +static void gicv2_clear_lr(int lr) +{ + writel_relaxed(0, GICH + GICH_LR + lr * 4); +} + +static int gicv_v2_init(struct domain *d) +{ + int ret; + + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv2.dbase; + d->arch.vgic.cbase = gicv2.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } + + d->arch.vgic.nr_lines = 0; + + /* + * Map the gic virtual cpu interface in the gic cpu interface + * region of the guest. + * + * The second page is always mapped at +4K irrespective of the + * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. + */ + ret = map_mmio_regions(d, d->arch.vgic.cbase, + d->arch.vgic.cbase + PAGE_SIZE - 1, + gicv2.vbase); + if ( ret ) + return ret; + + if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, + d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, + gicv2.vbase + PAGE_SIZE); + else + ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, + d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, + gicv2.vbase + 16*PAGE_SIZE); + + return ret; +} + +static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint32_t lrv; + + lrv = readl_relaxed(GICH + GICH_LR + lr * 4); + lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; + lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_V2_LR_STATE_SHIFT) & GICH_V2_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_V2_LR_HW_SHIFT) & GICH_V2_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; +} + +static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +{ + uint32_t lrv = 0; + + lrv = ( ((lr_reg->pirq & GICH_V2_LR_PHYSICAL_MASK) << GICH_V2_LR_PHYSICAL_SHIFT) | + ((lr_reg->virq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT) | + ((uint32_t)(lr_reg->priority & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((uint32_t)(lr_reg->state & GICH_V2_LR_STATE_MASK) + << GICH_V2_LR_STATE_SHIFT) | + ((uint32_t)(lr_reg->hw_status & GICH_V2_LR_HW_MASK) + << GICH_V2_LR_HW_SHIFT) | + ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); + + writel_relaxed(lrv, GICH + GICH_LR + lr * 4); +} + +static void gicv2_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr = readl_relaxed(GICH + GICH_HCR); + + if ( status ) + hcr |= flag; + else + hcr &= (~flag); + + writel_relaxed(hcr, GICH + GICH_HCR); +} + +static unsigned int gicv2_read_vmcr_priority(void) +{ + return ((readl_relaxed(GICH + GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + & GICH_V2_VMCR_PRIORITY_MASK); +} + +static unsigned int gicv2_read_apr(int apr_reg) +{ + return readl_relaxed(GICH + GICH_APR); +} + +static void gicv2_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + desc->status &= ~IRQ_DISABLED; + dsb(sy); + /* Enable routing */ + writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static void gicv2_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + /* Disable routing */ + writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); + desc->status |= IRQ_DISABLED; + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static unsigned int gicv2_irq_startup(struct irq_desc *desc) +{ + gicv2_irq_enable(desc); + + return 0; +} + +static void gicv2_irq_shutdown(struct irq_desc *desc) +{ + gicv2_irq_disable(desc); +} + +static void gicv2_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv2_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv2_eoi_irq(desc); + /* Deactivate */ + gicv2_dir_irq(desc); +} + +static void gicv2_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv2_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +{ + BUG(); +} + +/* XXX different for level vs edge */ +static hw_irq_controller gicv2_host_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_host_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +static hw_irq_controller gicv2_guest_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_guest_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +const static struct gic_hw_operations gicv2_ops = { + .info = &gicv2_info, + .secondary_init = gicv2_secondary_cpu_init, + .save_state = gicv2_save_state, + .restore_state = gicv2_restore_state, + .dump_state = gicv2_dump_state, + .gicv_setup = gicv_v2_init, + .gic_host_irq_type = &gicv2_host_irq_type, + .gic_guest_irq_type = &gicv2_guest_irq_type, + .eoi_irq = gicv2_eoi_irq, + .deactivate_irq = gicv2_dir_irq, + .read_irq = gicv2_read_irq, + .set_irq_properties = gicv2_set_irq_properties, + .send_SGI = gicv2_send_SGI, + .disable_interface = gicv2_disable_interface, + .update_lr = gicv2_update_lr, + .update_hcr_status = gicv2_hcr_status, + .clear_lr = gicv2_clear_lr, + .read_lr = gicv2_read_lr, + .write_lr = gicv2_write_lr, + .read_vmcr_priority = gicv2_read_vmcr_priority, + .read_apr = gicv2_read_apr, +}; + +/* Set up the GIC */ +void __init gicv2_init(void) +{ + static const struct dt_device_match gic_ids[] __initconst = + { + DT_MATCH_GIC, + { /* sentinel */ }, + }; + struct dt_device_node *node; + int res; + + node = dt_find_interrupt_controller(gic_ids); + if ( !node ) + panic("GICv2: Unable to find compatible GIC in the device tree"); + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); + if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the distributor"); + + res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); + if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the CPU"); + + res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); + if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the hypervisor"); + + res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); + if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the virtual CPU"); + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv2: Cannot find the maintenance IRQ"); + gicv2_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + /* TODO: Add check on distributor, cpu size */ + + printk("GICv2 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_cpu_addr=%"PRIpaddr"\n" + " gic_hyp_addr=%"PRIpaddr"\n" + " gic_vcpu_addr=%"PRIpaddr"\n" + " gic_maintenance_irq=%u\n", + gicv2.dbase, gicv2.cbase, gicv2.hbase, gicv2.vbase, + gicv2_info.maintenance_irq); + + if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || + (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2 interfaces not page aligned"); + + gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); + if ( !gicv2.map_dbase ) + panic("GICv2: Failed to ioremap for GIC distributor\n"); + + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 0x10); + else + gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 2); + + if ( !gicv2.map_cbase ) + panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + + gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); + if ( !gicv2.map_hbase ) + panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + + /* Global settings: interrupt distributor */ + spin_lock_init(&gicv2.lock); + spin_lock(&gicv2.lock); + + gicv2_dist_init(); + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + gicv2_info.hw_version = GIC_V2; + register_gic_ops(&gicv2_ops); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 4ac6da3..3624391 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -34,196 +33,68 @@ #include #include -#define GICD (gic.map_dbase) -#define GICC (gic.map_cbase) -#define GICH (gic.map_hbase) - static void gic_restore_pending_irqs(struct vcpu *v); -/* Global state */ -static struct { - paddr_t dbase; /* Address of distributor registers */ - void __iomem * map_dbase; /* IO mapped Address of distributor registers */ - paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ - paddr_t hbase; /* Address of virtual interface registers */ - void __iomem * map_hbase; /* IO Address of virtual interface registers */ - paddr_t vbase; /* Address of virtual cpu interface registers */ - unsigned int lines; /* Number of interrupts (SPIs + PPIs + SGIs) */ - unsigned int maintenance_irq; /* IRQ maintenance */ - unsigned int cpus; - spinlock_t lock; -} gic; - static DEFINE_PER_CPU(uint64_t, lr_mask); -static uint8_t nr_lrs; -#define lr_all_full() (this_cpu(lr_mask) == ((1 << nr_lrs) - 1)) - -/* The GIC mapping of CPU interfaces does not necessarily match the - * logical CPU numbering. Let's use mapping as returned by the GIC - * itself - */ -static DEFINE_PER_CPU(u8, gic_cpu_id); - -/* Maximum cpu interface per GIC */ -#define NR_GIC_CPU_IF 8 +#define lr_all_full() (this_cpu(lr_mask) == ((1 << gic_hw_ops->info->nr_lrs) - 1)) #undef GIC_DEBUG static void gic_update_one_lr(struct vcpu *v, int i); -static unsigned int gic_cpu_mask(const cpumask_t *cpumask) +static const struct gic_hw_operations *gic_hw_ops; + +void register_gic_ops(const struct gic_hw_operations *ops) { - unsigned int cpu; - unsigned int mask = 0; - cpumask_t possible_mask; + gic_hw_ops = ops; +} - cpumask_and(&possible_mask, cpumask, &cpu_possible_map); - for_each_cpu(cpu, &possible_mask) - { - ASSERT(cpu < NR_GIC_CPU_IF); - mask |= per_cpu(gic_cpu_id, cpu); - } +static void clear_cpu_lr_mask(void) +{ + this_cpu(lr_mask) = 0ULL; +} - return mask; +enum gic_version gic_hw_version(void) +{ + return gic_hw_ops->info->hw_version; } unsigned int gic_number_lines(void) { - return gic.lines; + return gic_hw_ops->info->nr_lines; } void gic_save_state(struct vcpu *v) { - int i; ASSERT(!local_irq_is_enabled()); /* No need for spinlocks here because interrupts are disabled around * this call and it only accesses struct vcpu fields that cannot be * accessed simultaneously by another pCPU. */ - for ( i=0; iarch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); v->arch.lr_mask = this_cpu(lr_mask); - v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); - /* Disable until next VCPU scheduled */ - writel_relaxed(0, GICH + GICH_HCR); + gic_hw_ops->save_state(v); isb(); } void gic_restore_state(struct vcpu *v) { - int i; ASSERT(!local_irq_is_enabled()); if ( is_idle_vcpu(v) ) return; this_cpu(lr_mask) = v->arch.lr_mask; - for ( i=0; iarch.gic_lr[i], GICH + GICH_LR + i * 4); - writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); - writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); + gic_hw_ops->restore_state(v); + isb(); gic_restore_pending_irqs(v); } -static void gic_irq_enable(struct irq_desc *desc) -{ - int irq = desc->irq; - unsigned long flags; - - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock_irqsave(&gic.lock, flags); - /* Enable routing */ - desc->status &= ~IRQ_DISABLED; - dsb(sy); - writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); - spin_unlock_irqrestore(&gic.lock, flags); -} - -static void gic_irq_disable(struct irq_desc *desc) -{ - int irq = desc->irq; - unsigned long flags; - - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock_irqsave(&gic.lock, flags); - /* Disable routing */ - writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); - desc->status |= IRQ_DISABLED; - spin_unlock_irqrestore(&gic.lock, flags); -} - -static unsigned int gic_irq_startup(struct irq_desc *desc) -{ - gic_irq_enable(desc); - - return 0; -} - -static void gic_irq_shutdown(struct irq_desc *desc) -{ - gic_irq_disable(desc); -} - -static void gic_irq_ack(struct irq_desc *desc) -{ - /* No ACK -- reading IAR has done this for us */ -} - -static void gic_host_irq_end(struct irq_desc *desc) -{ - int irq = desc->irq; - /* Lower the priority */ - writel_relaxed(irq, GICC + GICC_EOIR); - /* Deactivate */ - writel_relaxed(irq, GICC + GICC_DIR); -} - -static void gic_guest_irq_end(struct irq_desc *desc) -{ - int irq = desc->irq; - /* Lower the priority of the IRQ */ - writel_relaxed(irq, GICC + GICC_EOIR); - /* Deactivation happens in maintenance interrupt / via GICV */ -} - -static void gic_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) -{ - BUG(); -} - -/* XXX different for level vs edge */ -static hw_irq_controller gic_host_irq_type = { - .typename = "gic", - .startup = gic_irq_startup, - .shutdown = gic_irq_shutdown, - .enable = gic_irq_enable, - .disable = gic_irq_disable, - .ack = gic_irq_ack, - .end = gic_host_irq_end, - .set_affinity = gic_irq_set_affinity, -}; -static hw_irq_controller gic_guest_irq_type = { - .typename = "gic", - .startup = gic_irq_startup, - .shutdown = gic_irq_shutdown, - .enable = gic_irq_enable, - .disable = gic_irq_disable, - .ack = gic_irq_ack, - .end = gic_guest_irq_end, - .set_affinity = gic_irq_set_affinity, -}; - /* - * - needs to be called with a valid cpu_mask, ie each cpu in the mask has + * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init * - desc.lock must be held * - arch.type must be valid (i.e != DT_IRQ_TYPE_INVALID) @@ -232,33 +103,7 @@ static void gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; - unsigned int mask; - unsigned int irq = desc->irq; - unsigned int type = desc->arch.type; - - ASSERT(type != DT_IRQ_TYPE_INVALID); - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock(&gic.lock); - - mask = gic_cpu_mask(cpu_mask); - - /* Set edge / level */ - cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); - edgebit = 2u << (2 * (irq % 16)); - if ( type & DT_IRQ_TYPE_LEVEL_MASK ) - cfg &= ~edgebit; - else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) - cfg |= edgebit; - writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); - - /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); - /* Set priority */ - writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); - - spin_unlock(&gic.lock); + gic_hw_ops->set_irq_properties(desc, cpu_mask, priority); } /* Program the GIC to route an interrupt to the host (i.e. Xen) @@ -268,11 +113,11 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { ASSERT(priority <= 0xff); /* Only 8 bits of priority */ - ASSERT(desc->irq < gic.lines);/* Can't route interrupts that don't exist */ + ASSERT(desc->irq < gic_number_lines());/* Can't route interrupts that don't exist */ ASSERT(desc->status & IRQ_DISABLED); ASSERT(spin_is_locked(&desc->lock)); - desc->handler = &gic_host_irq_type; + desc->handler = gic_hw_ops->gic_host_irq_type; gic_set_irq_properties(desc, cpu_mask, priority); } @@ -286,7 +131,7 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, struct pending_irq *p; ASSERT(spin_is_locked(&desc->lock)); - desc->handler = &gic_guest_irq_type; + desc->handler = gic_hw_ops->gic_guest_irq_type; desc->status |= IRQ_GUEST; gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); @@ -296,102 +141,6 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, p->desc = desc; } -static void __init gic_dist_init(void) -{ - uint32_t type; - uint32_t cpumask; - int i; - - cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; - cpumask |= cpumask << 8; - cpumask |= cpumask << 16; - - /* Disable the distributor */ - writel_relaxed(0, GICD + GICD_CTLR); - - type = readl_relaxed(GICD + GICD_TYPER); - gic.lines = 32 * ((type & GICD_TYPE_LINES) + 1); - gic.cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); - printk("GIC: %d lines, %d cpu%s%s (IID %8.8x).\n", - gic.lines, gic.cpus, (gic.cpus == 1) ? "" : "s", - (type & GICD_TYPE_SEC) ? ", secure" : "", - readl_relaxed(GICD + GICD_IIDR)); - - /* Default all global IRQs to level, active low */ - for ( i = 32; i < gic.lines; i += 16 ) - writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); - - /* Route all global IRQs to this CPU */ - for ( i = 32; i < gic.lines; i += 4 ) - writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); - - /* Default priority for global interrupts */ - for ( i = 32; i < gic.lines; i += 4 ) - writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - - /* Disable all global interrupts */ - for ( i = 32; i < gic.lines; i += 32 ) - writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); - - /* Turn on the distributor */ - writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); -} - -static void __cpuinit gic_cpu_init(void) -{ - int i; - - this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; - - /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so - * even though they are controlled with GICD registers, they must - * be set up here with the other per-cpu state. */ - writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ - writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ - - /* Set SGI priorities */ - for (i = 0; i < 16; i += 4) - writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | - GIC_PRI_IPI << 8 | GIC_PRI_IPI, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - /* Set PPI priorities */ - for (i = 16; i < 32; i += 4) - writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - - /* Local settings: interface controller */ - /* Don't mask by priority */ - writel_relaxed(0xff, GICC + GICC_PMR); - /* Finest granularity of priority */ - writel_relaxed(0x0, GICC + GICC_BPR); - /* Turn on delivery */ - writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); -} - -static void gic_cpu_disable(void) -{ - writel_relaxed(0x0, GICC + GICC_CTLR); -} - -static void __cpuinit gic_hyp_init(void) -{ - uint32_t vtr; - - vtr = readl_relaxed(GICH + GICH_VTR); - nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; - - writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); - this_cpu(lr_mask) = 0ULL; -} - -static void __cpuinit gic_hyp_disable(void) -{ - writel_relaxed(0, GICH + GICH_HCR); -} - int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type) @@ -415,110 +164,9 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { - static const struct dt_device_match gic_ids[] __initconst = - { - DT_MATCH_GIC, - { /* sentinel */ }, - }; - struct dt_device_node *node; - int res; - - node = dt_find_interrupt_controller(gic_ids); - if ( !node ) - panic("Unable to find compatible GIC in the device tree"); - - dt_device_set_used_by(node, DOMID_XEN); - - res = dt_device_get_address(node, 0, &gic.dbase, NULL); - if ( res || !gic.dbase || (gic.dbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the distributor"); - - res = dt_device_get_address(node, 1, &gic.cbase, NULL); - if ( res || !gic.cbase || (gic.cbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the CPU"); - - res = dt_device_get_address(node, 2, &gic.hbase, NULL); - if ( res || !gic.hbase || (gic.hbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the hypervisor"); - - res = dt_device_get_address(node, 3, &gic.vbase, NULL); - if ( res || !gic.vbase || (gic.vbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the virtual CPU"); - - res = platform_get_irq(node, 0); - if ( res < 0 ) - panic("GIC: Cannot find the maintenance IRQ"); - gic.maintenance_irq = res; - - /* Set the GIC as the primary interrupt controller */ - dt_interrupt_controller = node; - - /* TODO: Add check on distributor, cpu size */ - - printk("GIC initialization:\n" - " gic_dist_addr=%"PRIpaddr"\n" - " gic_cpu_addr=%"PRIpaddr"\n" - " gic_hyp_addr=%"PRIpaddr"\n" - " gic_vcpu_addr=%"PRIpaddr"\n" - " gic_maintenance_irq=%u\n", - gic.dbase, gic.cbase, gic.hbase, gic.vbase, - gic.maintenance_irq); - - if ( (gic.dbase & ~PAGE_MASK) || (gic.cbase & ~PAGE_MASK) || - (gic.hbase & ~PAGE_MASK) || (gic.vbase & ~PAGE_MASK) ) - panic("GIC interfaces not page aligned"); - - gic.map_dbase = ioremap_nocache(gic.dbase, PAGE_SIZE); - if ( !gic.map_dbase ) - panic("Failed to ioremap for GIC distributor\n"); - - if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 0x10); - else - gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 2); - - if ( !gic.map_cbase ) - panic("Failed to ioremap for GIC CPU interface\n"); - - gic.map_hbase = ioremap_nocache(gic.hbase, PAGE_SIZE); - if ( !gic.map_hbase ) - panic("Failed to ioremap for GIC Virtual interface\n"); - - /* Global settings: interrupt distributor */ - spin_lock_init(&gic.lock); - spin_lock(&gic.lock); - - gic_dist_init(); - gic_cpu_init(); - gic_hyp_init(); - - spin_unlock(&gic.lock); -} - -static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, - const cpumask_t *cpu_mask) -{ - unsigned int mask = 0; - cpumask_t online_mask; - - switch ( irqmode ) - { - case SGI_TARGET_OTHERS: - writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); - break; - case SGI_TARGET_SELF: - writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); - break; - case SGI_TARGET_LIST: - cpumask_and(&online_mask, cpu_mask, &cpu_online_map); - mask = gic_cpu_mask(&online_mask); - writel_relaxed(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, - GICD + GICD_SGIR); - break; - default: - BUG(); - } + gicv2_init(); + /* Clear LR mask for cpu0 */ + clear_cpu_lr_mask(); } void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) @@ -526,12 +174,11 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_LIST, cpumask); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_LIST, cpumask); } void send_SGI_one(unsigned int cpu, enum gic_sgi sgi) { - ASSERT(cpu < NR_GIC_CPU_IF); /* Targets bitmap only supports 8 CPUs */ send_SGI_mask(cpumask_of(cpu), sgi); } @@ -540,7 +187,7 @@ void send_SGI_self(enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_SELF, NULL); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_SELF, NULL); } void send_SGI_allbutself(enum gic_sgi sgi) @@ -548,7 +195,7 @@ void send_SGI_allbutself(enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_OTHERS, NULL); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_OTHERS, NULL); } void smp_send_state_dump(unsigned int cpu) @@ -559,10 +206,9 @@ void smp_send_state_dump(unsigned int cpu) /* Set up the per-CPU parts of the GIC for a secondary CPU */ void __cpuinit gic_init_secondary_cpu(void) { - spin_lock(&gic.lock); - gic_cpu_init(); - gic_hyp_init(); - spin_unlock(&gic.lock); + gic_hw_ops->secondary_init(); + /* Clear LR mask for secondary cpus */ + clear_cpu_lr_mask(); } /* Shut down the per-CPU GIC interface */ @@ -570,28 +216,15 @@ void gic_disable_cpu(void) { ASSERT(!local_irq_is_enabled()); - spin_lock(&gic.lock); - gic_cpu_disable(); - gic_hyp_disable(); - spin_unlock(&gic.lock); + gic_hw_ops->disable_interface(); } static inline void gic_set_lr(int lr, struct pending_irq *p, - unsigned int state) + unsigned int state) { - uint32_t lr_val; - ASSERT(!local_irq_is_enabled()); - BUG_ON(lr >= nr_lrs); - BUG_ON(lr < 0); - BUG_ON(state & ~(GICH_LR_STATE_MASK<priority) << GICH_LR_PRIORITY_SHIFT) | - ((p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); - if ( p->desc != NULL ) - lr_val |= GICH_LR_HW | (p->desc->irq << GICH_LR_PHYSICAL_SHIFT); - writel_relaxed(lr_val, GICH + GICH_LR + lr * 4); + gic_hw_ops->update_lr(lr, p, state); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); @@ -651,6 +284,7 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int priority) { int i; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; ASSERT(spin_is_locked(&v->arch.vgic.lock)); @@ -670,36 +304,43 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, static void gic_update_one_lr(struct vcpu *v, int i) { struct pending_irq *p; - uint32_t lr; int irq; + struct gic_lr lr_val; ASSERT(spin_is_locked(&v->arch.vgic.lock)); ASSERT(!local_irq_is_enabled()); - lr = readl_relaxed(GICH + GICH_LR + i * 4); - irq = (lr >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; + gic_hw_ops->read_lr(i, &lr_val); + irq = lr_val.virq; p = irq_to_pending(v, irq); - if ( lr & GICH_LR_ACTIVE ) + if ( lr_val.state & GICH_LR_ACTIVE ) { set_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); if ( test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) { if ( p->desc == NULL ) - writel_relaxed(lr | GICH_LR_PENDING, GICH + GICH_LR + i * 4); + { + lr_val.state |= GICH_LR_PENDING; + gic_hw_ops->write_lr(i, &lr_val); + } else gdprintk(XENLOG_WARNING, "unable to inject hw irq=%d into d%dv%d: already active in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); } - } else if ( lr & GICH_LR_PENDING ) { + } + else if ( lr_val.state & GICH_LR_PENDING ) + { int q __attribute__ ((unused)) = test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); #ifdef GIC_DEBUG if ( q ) gdprintk(XENLOG_DEBUG, "trying to inject irq=%d into d%dv%d, when it is already pending in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); #endif - } else { - writel_relaxed(0, GICH + GICH_LR + i * 4); + } + else + { + gic_hw_ops->clear_lr(i); clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) @@ -719,6 +360,7 @@ void gic_clear_lrs(struct vcpu *v) { int i = 0; unsigned long flags; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; /* The idle domain has no LRs to be cleared. Since gic_restore_state * doesn't write any LR registers for the idle domain they could be @@ -739,10 +381,12 @@ void gic_clear_lrs(struct vcpu *v) static void gic_restore_pending_irqs(struct vcpu *v) { - int lr = 0, lrs = nr_lrs; + int lr = 0; struct pending_irq *p, *t, *p_r; struct list_head *inflight_r; unsigned long flags; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; + int lrs = nr_lrs; spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -807,13 +451,12 @@ int gic_events_need_delivery(void) struct vcpu *v = current; struct pending_irq *p; unsigned long flags; - const unsigned long apr = readl_relaxed(GICH + GICH_APR); + const unsigned long apr = gic_hw_ops->read_apr(0); int mask_priority; int active_priority; int rc = 0; - mask_priority = (readl_relaxed(GICH + GICH_VMCR) - >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; + mask_priority = gic_hw_ops->read_vmcr_priority(); active_priority = find_next_bit(&apr, 32, 0); spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -843,23 +486,23 @@ out: void gic_inject(void) { - uint32_t hcr; ASSERT(!local_irq_is_enabled()); gic_restore_pending_irqs(current); - hcr = readl_relaxed(GICH + GICH_HCR); - if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) - writel_relaxed(hcr | GICH_HCR_UIE, GICH + GICH_HCR); + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 1); else - writel_relaxed(hcr & ~GICH_HCR_UIE, GICH + GICH_HCR); + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ - writel_relaxed(sgi, GICC + GICC_EOIR); + struct irq_desc *desc = irq_to_desc(sgi); + + /* Lower the priority */ + gic_hw_ops->eoi_irq(desc); switch (sgi) { @@ -878,19 +521,17 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) } /* Deactivate */ - writel_relaxed(sgi, GICC + GICC_DIR); + gic_hw_ops->deactivate_irq(desc); } /* Accept an interrupt from the GIC and dispatch its handler */ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) { - uint32_t intack; unsigned int irq; - do { - intack = readl_relaxed(GICC + GICC_IAR); - irq = intack & GICC_IA_IRQ; + /* Reading IRQ will ACK it */ + irq = gic_hw_ops->read_irq(); if ( likely(irq >= 16 && irq < 1021) ) { @@ -912,49 +553,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) int gicv_setup(struct domain *d) { - int ret; - - /* - * The hardware domain gets the hardware address. - * Guests get the virtual platform layout. - */ - if ( is_hardware_domain(d) ) - { - d->arch.vgic.dbase = gic.dbase; - d->arch.vgic.cbase = gic.cbase; - } - else - { - d->arch.vgic.dbase = GUEST_GICD_BASE; - d->arch.vgic.cbase = GUEST_GICC_BASE; - } - - d->arch.vgic.nr_lines = 0; - - /* - * Map the gic virtual cpu interface in the gic cpu interface - * region of the guest. - * - * The second page is always mapped at +4K irrespective of the - * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. - */ - ret = map_mmio_regions(d, d->arch.vgic.cbase, - d->arch.vgic.cbase + PAGE_SIZE - 1, - gic.vbase); - if (ret) - return ret; - - if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gic.vbase + PAGE_SIZE); - else - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gic.vbase + 16*PAGE_SIZE); - - return ret; - + return gic_hw_ops->gicv_setup(d); } static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) @@ -969,18 +568,10 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r void gic_dump_info(struct vcpu *v) { - int i; struct pending_irq *p; printk("GICH_LRs (vcpu %d) mask=%"PRIx64"\n", v->vcpu_id, v->arch.lr_mask); - if ( v == current ) - { - for ( i = 0; i < nr_lrs; i++ ) - printk(" HW_LR[%d]=%x\n", i, readl_relaxed(GICH + GICH_LR + i * 4)); - } else { - for ( i = 0; i < nr_lrs; i++ ) - printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); - } + gic_hw_ops->dump_state(v); list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight ) { @@ -991,12 +582,11 @@ void gic_dump_info(struct vcpu *v) { printk("Pending irq=%d\n", p->irq); } - } void __cpuinit init_maintenance_interrupt(void) { - request_irq(gic.maintenance_irq, 0, maintenance_interrupt, + request_irq(gic_hw_ops->info->maintenance_irq, 0, maintenance_interrupt, "irq-maintenance", NULL); } diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 7fa3b95..9a85633 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -114,24 +114,6 @@ #define GICH_MISR_VGRP1E (1 << 6) #define GICH_MISR_VGRP1D (1 << 7) -#define GICH_LR_VIRTUAL_MASK 0x3ff -#define GICH_LR_VIRTUAL_SHIFT 0 -#define GICH_LR_PHYSICAL_MASK 0x3ff -#define GICH_LR_PHYSICAL_SHIFT 10 -#define GICH_LR_STATE_MASK 0x3 -#define GICH_LR_STATE_SHIFT 28 -#define GICH_LR_PRIORITY_SHIFT 23 -#define GICH_LR_MAINTENANCE_IRQ (1<<19) -#define GICH_LR_PENDING (1<<28) -#define GICH_LR_ACTIVE (1<<29) -#define GICH_LR_GRP1 (1<<30) -#define GICH_LR_HW (1<<31) -#define GICH_LR_CPUID_SHIFT 9 -#define GICH_VTR_NRLRGS 0x3f - -#define GICH_VMCR_PRIORITY_MASK 0x1f -#define GICH_VMCR_PRIORITY_SHIFT 27 - /* * 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 @@ -155,6 +137,8 @@ #define GIC_PRI_TO_GUEST(pri) (pri >> 3) /* GICH_LR and GICH_VMCR only support 5 bits for guest irq priority */ +#define GICH_LR_PENDING 1 +#define GICH_LR_ACTIVE 2 #ifndef __ASSEMBLY__ #include @@ -163,6 +147,28 @@ #define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") +/* + * Decode LR register content. + * The LR register format is different for GIC HW version + */ +struct gic_lr { + /* Physical IRQ */ + uint32_t pirq; + /* Virtual IRQ */ + uint32_t virq; + uint8_t priority; + uint8_t state; + uint8_t hw_status; + uint8_t grp; +}; + +enum gic_version { + GIC_V2, +}; + +extern enum gic_version gic_hw_version(void); +extern void gicv2_init(void); + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); @@ -234,6 +240,71 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type); void gic_clear_lrs(struct vcpu *v); +struct gic_info { + /* GIC version */ + enum gic_version hw_version; + /* Number of GIC lines supported */ + unsigned int nr_lines; + /* Number of LR registers */ + uint8_t nr_lrs; + /* Maintenance irq number */ + unsigned int maintenance_irq; +}; + +struct gic_hw_operations { + /* Hold GIC HW information */ + const struct gic_info *info; + /* Save GIC registers */ + void (*save_state)(struct vcpu *); + /* Restore GIC registers */ + void (*restore_state)(const struct vcpu *); + /* Dump GIC LR register information */ + void (*dump_state)(const struct vcpu *); + /* Map MMIO region of GIC */ + int (*gicv_setup)(struct domain *); + + /* hw_irq_controller to enable/disable/eoi host irq */ + hw_irq_controller *gic_host_irq_type; + + /* hw_irq_controller to enable/disable/eoi guest irq */ + hw_irq_controller *gic_guest_irq_type; + + /* End of Interrupt */ + void (*eoi_irq)(struct irq_desc *irqd); + /* Deactivate/reduce priority of irq */ + void (*deactivate_irq)(struct irq_desc *irqd); + /* Read IRQ id and Ack */ + unsigned int (*read_irq)(void); + /* Set IRQ property */ + void (*set_irq_properties)(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority); + /* Send SGI */ + void (*send_SGI)(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *online_mask); + /* Disable CPU physical and virtual interfaces */ + void (*disable_interface)(void); + /* Update LR register with state and priority */ + void (*update_lr)(int lr, const struct pending_irq *pending_irq, + unsigned int state); + /* Update HCR status register */ + void (*update_hcr_status)(uint32_t flag, bool_t set); + /* Clear LR register */ + void (*clear_lr)(int lr); + /* Read LR register and populate gic_lr structure */ + void (*read_lr)(int lr, struct gic_lr *); + /* Write LR register from gic_lr structure */ + void (*write_lr)(int lr, const struct gic_lr *); + /* Read VMCR priority */ + unsigned int (*read_vmcr_priority)(void); + /* Read APRn register */ + unsigned int (*read_apr)(int apr_reg); + /* Secondary CPU init */ + int (*secondary_init)(void); +}; + +void register_gic_ops(const struct gic_hw_operations *ops); + #endif /* __ASSEMBLY__ */ #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 Jul 05 16:53:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:53: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 1X3TDq-0002Xj-AH; Sat, 05 Jul 2014 16:53:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDp-0002XZ-JT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:58 +0000 Received: from [85.158.137.68:62754] by server-12.bemta-3.messagelabs.com id E3/73-12714-4AD28B35; Sat, 05 Jul 2014 16:53:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404579232!14244281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32256 invoked from network); 5 Jul 2014 16:53:53 -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; 5 Jul 2014 16:53:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDk-0006L4-Ky for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDk-0002t1-Im for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:53:52 +0000 Date: Sat, 05 Jul 2014 16:53:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: segregate and split GIC low level functionality X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee65c871ea16ca0e242df7fadebd53ac05dd2e91 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:11 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: segregate and split GIC low level functionality GIC driver contains both generic and hardware specific low level functionality in gic.c file. With this patch, low level functionality is moved to separate file gic-v2.c and generic code is kept in gic.c file Callbacks are registered by low level driver with generic driver and are called wherever required. The locking mechanism is not changed. This helps to separate generic and hardware functionality and implement future hardware version drivers. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Julien Grall Tested-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/gic-v2.c | 679 +++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic.c | 546 +++++------------------------------- xen/include/asm-arm/gic.h | 107 ++++++-- 4 files changed, 837 insertions(+), 497 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 63e0460..969ee52 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -10,7 +10,7 @@ obj-y += vpsci.o obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o -obj-y += gic.o +obj-y += gic.o gic-v2.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c new file mode 100644 index 0000000..3539cb8 --- /dev/null +++ b/xen/arch/arm/gic-v2.c @@ -0,0 +1,679 @@ +/* + * xen/arch/arm/gic-v2.c + * + * ARM Generic Interrupt Controller support v2 + * + * Tim Deegan + * Copyright (c) 2011 Citrix Systems. + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* + * LR register definitions are GIC v2 specific. + * Moved these definitions from header file to here + */ +#define GICH_V2_LR_VIRTUAL_MASK 0x3ff +#define GICH_V2_LR_VIRTUAL_SHIFT 0 +#define GICH_V2_LR_PHYSICAL_MASK 0x3ff +#define GICH_V2_LR_PHYSICAL_SHIFT 10 +#define GICH_V2_LR_STATE_MASK 0x3 +#define GICH_V2_LR_STATE_SHIFT 28 +#define GICH_V2_LR_PRIORITY_SHIFT 23 +#define GICH_V2_LR_PRIORITY_MASK 0x1f +#define GICH_V2_LR_HW_SHIFT 31 +#define GICH_V2_LR_HW_MASK 0x1 +#define GICH_V2_LR_GRP_SHIFT 30 +#define GICH_V2_LR_GRP_MASK 0x1 +#define GICH_V2_LR_MAINTENANCE_IRQ (1<<19) +#define GICH_V2_LR_GRP1 (1<<30) +#define GICH_V2_LR_HW (1<<31) +#define GICH_V2_LR_CPUID_SHIFT 9 +#define GICH_V2_VTR_NRLRGS 0x3f + +#define GICH_V2_VMCR_PRIORITY_MASK 0x1f +#define GICH_V2_VMCR_PRIORITY_SHIFT 27 + +#define GICD (gicv2.map_dbase) +#define GICC (gicv2.map_cbase) +#define GICH (gicv2.map_hbase) + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ + paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ + paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ + paddr_t vbase; /* Address of virtual cpu interface registers */ + spinlock_t lock; +} gicv2; + +static struct gic_info gicv2_info; + +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu( cpu, &possible_mask ) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + +static void gicv2_save_state(struct vcpu *v) +{ + int i; + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + */ + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + + v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); + /* Disable until next VCPU scheduled */ + writel_relaxed(0, GICH + GICH_HCR); +} + +static void gicv2_restore_state(const struct vcpu *v) +{ + int i; + + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + + writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); +} + +static void gicv2_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%x\n", i, + readl_relaxed(GICH + GICH_LR + i * 4)); + } + else + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); + } +} + +static void gicv2_eoi_irq(struct irq_desc *irqd) +{ + int irq = irqd->irq; + /* Lower the priority */ + writel_relaxed(irq, GICC + GICC_EOIR); +} + +static void gicv2_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + writel_relaxed(irqd->irq, GICC + GICC_DIR); +} + +static unsigned int gicv2_read_irq(void) +{ + return (readl_relaxed(GICC + GICC_IAR) & GICC_IA_IRQ); +} + +/* + * needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ +static void gicv2_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, edgebit; + unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + ASSERT(type != DT_IRQ_TYPE_INVALID); + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock(&gicv2.lock); + /* Set edge / level */ + cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); + /* Set priority */ + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + + spin_unlock(&gicv2.lock); +} + +static void __init gicv2_dist_init(void) +{ + uint32_t type; + uint32_t cpumask; + uint32_t gic_cpus; + int i; + + cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + cpumask |= cpumask << 8; + cpumask |= cpumask << 16; + + /* Disable the distributor */ + writel_relaxed(0, GICD + GICD_CTLR); + + type = readl_relaxed(GICD + GICD_TYPER); + gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + (type & GICD_TYPE_SEC) ? ", secure" : "", + readl_relaxed(GICD + GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); + + /* Route all global IRQs to this CPU */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); + + /* Default priority for global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Disable all global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) + writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); + + /* Turn on the distributor */ + writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); +} + +static void __cpuinit gicv2_cpu_init(void) +{ + int i; + + this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so + * even though they are controlled with GICD registers, they must + * be set up here with the other per-cpu state. */ + writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ + writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + + /* Set SGI priorities */ + for ( i = 0; i < 16; i += 4 ) + writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Set PPI priorities */ + for ( i = 16; i < 32; i += 4 ) + writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD + GICD_IPRIORITYR + (i / 4) * 4); + + /* Local settings: interface controller */ + /* Don't mask by priority */ + writel_relaxed(0xff, GICC + GICC_PMR); + /* Finest granularity of priority */ + writel_relaxed(0x0, GICC + GICC_BPR); + /* Turn on delivery */ + writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); +} + +static void gicv2_cpu_disable(void) +{ + writel_relaxed(0x0, GICC + GICC_CTLR); +} + +static void __cpuinit gicv2_hyp_init(void) +{ + uint32_t vtr; + uint8_t nr_lrs; + + vtr = readl_relaxed(GICH + GICH_VTR); + nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; + gicv2_info.nr_lrs = nr_lrs; + + writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); +} + +static void __cpuinit gicv2_hyp_disable(void) +{ + writel_relaxed(0, GICH + GICH_HCR); +} + +static int gicv2_secondary_cpu_init(void) +{ + spin_lock(&gicv2.lock); + + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + return 0; +} + +static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) +{ + unsigned int mask = 0; + cpumask_t online_mask; + + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); + break; + case SGI_TARGET_SELF: + writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gicv2_cpu_mask(&online_mask); + writel_relaxed(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD + GICD_SGIR); + break; + default: + BUG(); + } +} + +/* Shut down the per-CPU GIC interface */ +static void gicv2_disable_interface(void) +{ + spin_lock(&gicv2.lock); + gicv2_cpu_disable(); + gicv2_hyp_disable(); + spin_unlock(&gicv2.lock); +} + +static void gicv2_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint32_t lr_reg; + + BUG_ON(lr >= gicv2_info.nr_lrs); + BUG_ON(lr < 0); + + lr_reg = (((state & GICH_V2_LR_STATE_MASK) << GICH_V2_LR_STATE_SHIFT) | + ((GIC_PRI_TO_GUEST(p->priority) & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); + + if ( p->desc != NULL ) + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); + + writel_relaxed(lr_reg, GICH + GICH_LR + lr * 4); +} + +static void gicv2_clear_lr(int lr) +{ + writel_relaxed(0, GICH + GICH_LR + lr * 4); +} + +static int gicv_v2_init(struct domain *d) +{ + int ret; + + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv2.dbase; + d->arch.vgic.cbase = gicv2.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } + + d->arch.vgic.nr_lines = 0; + + /* + * Map the gic virtual cpu interface in the gic cpu interface + * region of the guest. + * + * The second page is always mapped at +4K irrespective of the + * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. + */ + ret = map_mmio_regions(d, d->arch.vgic.cbase, + d->arch.vgic.cbase + PAGE_SIZE - 1, + gicv2.vbase); + if ( ret ) + return ret; + + if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, + d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, + gicv2.vbase + PAGE_SIZE); + else + ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, + d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, + gicv2.vbase + 16*PAGE_SIZE); + + return ret; +} + +static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint32_t lrv; + + lrv = readl_relaxed(GICH + GICH_LR + lr * 4); + lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; + lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_V2_LR_STATE_SHIFT) & GICH_V2_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_V2_LR_HW_SHIFT) & GICH_V2_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; +} + +static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +{ + uint32_t lrv = 0; + + lrv = ( ((lr_reg->pirq & GICH_V2_LR_PHYSICAL_MASK) << GICH_V2_LR_PHYSICAL_SHIFT) | + ((lr_reg->virq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT) | + ((uint32_t)(lr_reg->priority & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((uint32_t)(lr_reg->state & GICH_V2_LR_STATE_MASK) + << GICH_V2_LR_STATE_SHIFT) | + ((uint32_t)(lr_reg->hw_status & GICH_V2_LR_HW_MASK) + << GICH_V2_LR_HW_SHIFT) | + ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); + + writel_relaxed(lrv, GICH + GICH_LR + lr * 4); +} + +static void gicv2_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr = readl_relaxed(GICH + GICH_HCR); + + if ( status ) + hcr |= flag; + else + hcr &= (~flag); + + writel_relaxed(hcr, GICH + GICH_HCR); +} + +static unsigned int gicv2_read_vmcr_priority(void) +{ + return ((readl_relaxed(GICH + GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + & GICH_V2_VMCR_PRIORITY_MASK); +} + +static unsigned int gicv2_read_apr(int apr_reg) +{ + return readl_relaxed(GICH + GICH_APR); +} + +static void gicv2_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + desc->status &= ~IRQ_DISABLED; + dsb(sy); + /* Enable routing */ + writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static void gicv2_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + /* Disable routing */ + writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); + desc->status |= IRQ_DISABLED; + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static unsigned int gicv2_irq_startup(struct irq_desc *desc) +{ + gicv2_irq_enable(desc); + + return 0; +} + +static void gicv2_irq_shutdown(struct irq_desc *desc) +{ + gicv2_irq_disable(desc); +} + +static void gicv2_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv2_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv2_eoi_irq(desc); + /* Deactivate */ + gicv2_dir_irq(desc); +} + +static void gicv2_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv2_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +{ + BUG(); +} + +/* XXX different for level vs edge */ +static hw_irq_controller gicv2_host_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_host_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +static hw_irq_controller gicv2_guest_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_guest_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +const static struct gic_hw_operations gicv2_ops = { + .info = &gicv2_info, + .secondary_init = gicv2_secondary_cpu_init, + .save_state = gicv2_save_state, + .restore_state = gicv2_restore_state, + .dump_state = gicv2_dump_state, + .gicv_setup = gicv_v2_init, + .gic_host_irq_type = &gicv2_host_irq_type, + .gic_guest_irq_type = &gicv2_guest_irq_type, + .eoi_irq = gicv2_eoi_irq, + .deactivate_irq = gicv2_dir_irq, + .read_irq = gicv2_read_irq, + .set_irq_properties = gicv2_set_irq_properties, + .send_SGI = gicv2_send_SGI, + .disable_interface = gicv2_disable_interface, + .update_lr = gicv2_update_lr, + .update_hcr_status = gicv2_hcr_status, + .clear_lr = gicv2_clear_lr, + .read_lr = gicv2_read_lr, + .write_lr = gicv2_write_lr, + .read_vmcr_priority = gicv2_read_vmcr_priority, + .read_apr = gicv2_read_apr, +}; + +/* Set up the GIC */ +void __init gicv2_init(void) +{ + static const struct dt_device_match gic_ids[] __initconst = + { + DT_MATCH_GIC, + { /* sentinel */ }, + }; + struct dt_device_node *node; + int res; + + node = dt_find_interrupt_controller(gic_ids); + if ( !node ) + panic("GICv2: Unable to find compatible GIC in the device tree"); + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); + if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the distributor"); + + res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); + if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the CPU"); + + res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); + if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the hypervisor"); + + res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); + if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the virtual CPU"); + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv2: Cannot find the maintenance IRQ"); + gicv2_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + /* TODO: Add check on distributor, cpu size */ + + printk("GICv2 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_cpu_addr=%"PRIpaddr"\n" + " gic_hyp_addr=%"PRIpaddr"\n" + " gic_vcpu_addr=%"PRIpaddr"\n" + " gic_maintenance_irq=%u\n", + gicv2.dbase, gicv2.cbase, gicv2.hbase, gicv2.vbase, + gicv2_info.maintenance_irq); + + if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || + (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2 interfaces not page aligned"); + + gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); + if ( !gicv2.map_dbase ) + panic("GICv2: Failed to ioremap for GIC distributor\n"); + + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 0x10); + else + gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 2); + + if ( !gicv2.map_cbase ) + panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + + gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); + if ( !gicv2.map_hbase ) + panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + + /* Global settings: interrupt distributor */ + spin_lock_init(&gicv2.lock); + spin_lock(&gicv2.lock); + + gicv2_dist_init(); + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + gicv2_info.hw_version = GIC_V2; + register_gic_ops(&gicv2_ops); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 4ac6da3..3624391 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -34,196 +33,68 @@ #include #include -#define GICD (gic.map_dbase) -#define GICC (gic.map_cbase) -#define GICH (gic.map_hbase) - static void gic_restore_pending_irqs(struct vcpu *v); -/* Global state */ -static struct { - paddr_t dbase; /* Address of distributor registers */ - void __iomem * map_dbase; /* IO mapped Address of distributor registers */ - paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ - paddr_t hbase; /* Address of virtual interface registers */ - void __iomem * map_hbase; /* IO Address of virtual interface registers */ - paddr_t vbase; /* Address of virtual cpu interface registers */ - unsigned int lines; /* Number of interrupts (SPIs + PPIs + SGIs) */ - unsigned int maintenance_irq; /* IRQ maintenance */ - unsigned int cpus; - spinlock_t lock; -} gic; - static DEFINE_PER_CPU(uint64_t, lr_mask); -static uint8_t nr_lrs; -#define lr_all_full() (this_cpu(lr_mask) == ((1 << nr_lrs) - 1)) - -/* The GIC mapping of CPU interfaces does not necessarily match the - * logical CPU numbering. Let's use mapping as returned by the GIC - * itself - */ -static DEFINE_PER_CPU(u8, gic_cpu_id); - -/* Maximum cpu interface per GIC */ -#define NR_GIC_CPU_IF 8 +#define lr_all_full() (this_cpu(lr_mask) == ((1 << gic_hw_ops->info->nr_lrs) - 1)) #undef GIC_DEBUG static void gic_update_one_lr(struct vcpu *v, int i); -static unsigned int gic_cpu_mask(const cpumask_t *cpumask) +static const struct gic_hw_operations *gic_hw_ops; + +void register_gic_ops(const struct gic_hw_operations *ops) { - unsigned int cpu; - unsigned int mask = 0; - cpumask_t possible_mask; + gic_hw_ops = ops; +} - cpumask_and(&possible_mask, cpumask, &cpu_possible_map); - for_each_cpu(cpu, &possible_mask) - { - ASSERT(cpu < NR_GIC_CPU_IF); - mask |= per_cpu(gic_cpu_id, cpu); - } +static void clear_cpu_lr_mask(void) +{ + this_cpu(lr_mask) = 0ULL; +} - return mask; +enum gic_version gic_hw_version(void) +{ + return gic_hw_ops->info->hw_version; } unsigned int gic_number_lines(void) { - return gic.lines; + return gic_hw_ops->info->nr_lines; } void gic_save_state(struct vcpu *v) { - int i; ASSERT(!local_irq_is_enabled()); /* No need for spinlocks here because interrupts are disabled around * this call and it only accesses struct vcpu fields that cannot be * accessed simultaneously by another pCPU. */ - for ( i=0; iarch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); v->arch.lr_mask = this_cpu(lr_mask); - v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); - /* Disable until next VCPU scheduled */ - writel_relaxed(0, GICH + GICH_HCR); + gic_hw_ops->save_state(v); isb(); } void gic_restore_state(struct vcpu *v) { - int i; ASSERT(!local_irq_is_enabled()); if ( is_idle_vcpu(v) ) return; this_cpu(lr_mask) = v->arch.lr_mask; - for ( i=0; iarch.gic_lr[i], GICH + GICH_LR + i * 4); - writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); - writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); + gic_hw_ops->restore_state(v); + isb(); gic_restore_pending_irqs(v); } -static void gic_irq_enable(struct irq_desc *desc) -{ - int irq = desc->irq; - unsigned long flags; - - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock_irqsave(&gic.lock, flags); - /* Enable routing */ - desc->status &= ~IRQ_DISABLED; - dsb(sy); - writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); - spin_unlock_irqrestore(&gic.lock, flags); -} - -static void gic_irq_disable(struct irq_desc *desc) -{ - int irq = desc->irq; - unsigned long flags; - - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock_irqsave(&gic.lock, flags); - /* Disable routing */ - writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); - desc->status |= IRQ_DISABLED; - spin_unlock_irqrestore(&gic.lock, flags); -} - -static unsigned int gic_irq_startup(struct irq_desc *desc) -{ - gic_irq_enable(desc); - - return 0; -} - -static void gic_irq_shutdown(struct irq_desc *desc) -{ - gic_irq_disable(desc); -} - -static void gic_irq_ack(struct irq_desc *desc) -{ - /* No ACK -- reading IAR has done this for us */ -} - -static void gic_host_irq_end(struct irq_desc *desc) -{ - int irq = desc->irq; - /* Lower the priority */ - writel_relaxed(irq, GICC + GICC_EOIR); - /* Deactivate */ - writel_relaxed(irq, GICC + GICC_DIR); -} - -static void gic_guest_irq_end(struct irq_desc *desc) -{ - int irq = desc->irq; - /* Lower the priority of the IRQ */ - writel_relaxed(irq, GICC + GICC_EOIR); - /* Deactivation happens in maintenance interrupt / via GICV */ -} - -static void gic_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) -{ - BUG(); -} - -/* XXX different for level vs edge */ -static hw_irq_controller gic_host_irq_type = { - .typename = "gic", - .startup = gic_irq_startup, - .shutdown = gic_irq_shutdown, - .enable = gic_irq_enable, - .disable = gic_irq_disable, - .ack = gic_irq_ack, - .end = gic_host_irq_end, - .set_affinity = gic_irq_set_affinity, -}; -static hw_irq_controller gic_guest_irq_type = { - .typename = "gic", - .startup = gic_irq_startup, - .shutdown = gic_irq_shutdown, - .enable = gic_irq_enable, - .disable = gic_irq_disable, - .ack = gic_irq_ack, - .end = gic_guest_irq_end, - .set_affinity = gic_irq_set_affinity, -}; - /* - * - needs to be called with a valid cpu_mask, ie each cpu in the mask has + * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init * - desc.lock must be held * - arch.type must be valid (i.e != DT_IRQ_TYPE_INVALID) @@ -232,33 +103,7 @@ static void gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; - unsigned int mask; - unsigned int irq = desc->irq; - unsigned int type = desc->arch.type; - - ASSERT(type != DT_IRQ_TYPE_INVALID); - ASSERT(spin_is_locked(&desc->lock)); - - spin_lock(&gic.lock); - - mask = gic_cpu_mask(cpu_mask); - - /* Set edge / level */ - cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); - edgebit = 2u << (2 * (irq % 16)); - if ( type & DT_IRQ_TYPE_LEVEL_MASK ) - cfg &= ~edgebit; - else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) - cfg |= edgebit; - writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); - - /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); - /* Set priority */ - writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); - - spin_unlock(&gic.lock); + gic_hw_ops->set_irq_properties(desc, cpu_mask, priority); } /* Program the GIC to route an interrupt to the host (i.e. Xen) @@ -268,11 +113,11 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { ASSERT(priority <= 0xff); /* Only 8 bits of priority */ - ASSERT(desc->irq < gic.lines);/* Can't route interrupts that don't exist */ + ASSERT(desc->irq < gic_number_lines());/* Can't route interrupts that don't exist */ ASSERT(desc->status & IRQ_DISABLED); ASSERT(spin_is_locked(&desc->lock)); - desc->handler = &gic_host_irq_type; + desc->handler = gic_hw_ops->gic_host_irq_type; gic_set_irq_properties(desc, cpu_mask, priority); } @@ -286,7 +131,7 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, struct pending_irq *p; ASSERT(spin_is_locked(&desc->lock)); - desc->handler = &gic_guest_irq_type; + desc->handler = gic_hw_ops->gic_guest_irq_type; desc->status |= IRQ_GUEST; gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); @@ -296,102 +141,6 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, p->desc = desc; } -static void __init gic_dist_init(void) -{ - uint32_t type; - uint32_t cpumask; - int i; - - cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; - cpumask |= cpumask << 8; - cpumask |= cpumask << 16; - - /* Disable the distributor */ - writel_relaxed(0, GICD + GICD_CTLR); - - type = readl_relaxed(GICD + GICD_TYPER); - gic.lines = 32 * ((type & GICD_TYPE_LINES) + 1); - gic.cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); - printk("GIC: %d lines, %d cpu%s%s (IID %8.8x).\n", - gic.lines, gic.cpus, (gic.cpus == 1) ? "" : "s", - (type & GICD_TYPE_SEC) ? ", secure" : "", - readl_relaxed(GICD + GICD_IIDR)); - - /* Default all global IRQs to level, active low */ - for ( i = 32; i < gic.lines; i += 16 ) - writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); - - /* Route all global IRQs to this CPU */ - for ( i = 32; i < gic.lines; i += 4 ) - writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); - - /* Default priority for global interrupts */ - for ( i = 32; i < gic.lines; i += 4 ) - writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - - /* Disable all global interrupts */ - for ( i = 32; i < gic.lines; i += 32 ) - writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); - - /* Turn on the distributor */ - writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); -} - -static void __cpuinit gic_cpu_init(void) -{ - int i; - - this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; - - /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so - * even though they are controlled with GICD registers, they must - * be set up here with the other per-cpu state. */ - writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ - writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ - - /* Set SGI priorities */ - for (i = 0; i < 16; i += 4) - writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | - GIC_PRI_IPI << 8 | GIC_PRI_IPI, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - /* Set PPI priorities */ - for (i = 16; i < 32; i += 4) - writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); - - /* Local settings: interface controller */ - /* Don't mask by priority */ - writel_relaxed(0xff, GICC + GICC_PMR); - /* Finest granularity of priority */ - writel_relaxed(0x0, GICC + GICC_BPR); - /* Turn on delivery */ - writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); -} - -static void gic_cpu_disable(void) -{ - writel_relaxed(0x0, GICC + GICC_CTLR); -} - -static void __cpuinit gic_hyp_init(void) -{ - uint32_t vtr; - - vtr = readl_relaxed(GICH + GICH_VTR); - nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; - - writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); - this_cpu(lr_mask) = 0ULL; -} - -static void __cpuinit gic_hyp_disable(void) -{ - writel_relaxed(0, GICH + GICH_HCR); -} - int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type) @@ -415,110 +164,9 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { - static const struct dt_device_match gic_ids[] __initconst = - { - DT_MATCH_GIC, - { /* sentinel */ }, - }; - struct dt_device_node *node; - int res; - - node = dt_find_interrupt_controller(gic_ids); - if ( !node ) - panic("Unable to find compatible GIC in the device tree"); - - dt_device_set_used_by(node, DOMID_XEN); - - res = dt_device_get_address(node, 0, &gic.dbase, NULL); - if ( res || !gic.dbase || (gic.dbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the distributor"); - - res = dt_device_get_address(node, 1, &gic.cbase, NULL); - if ( res || !gic.cbase || (gic.cbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the CPU"); - - res = dt_device_get_address(node, 2, &gic.hbase, NULL); - if ( res || !gic.hbase || (gic.hbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the hypervisor"); - - res = dt_device_get_address(node, 3, &gic.vbase, NULL); - if ( res || !gic.vbase || (gic.vbase & ~PAGE_MASK) ) - panic("GIC: Cannot find a valid address for the virtual CPU"); - - res = platform_get_irq(node, 0); - if ( res < 0 ) - panic("GIC: Cannot find the maintenance IRQ"); - gic.maintenance_irq = res; - - /* Set the GIC as the primary interrupt controller */ - dt_interrupt_controller = node; - - /* TODO: Add check on distributor, cpu size */ - - printk("GIC initialization:\n" - " gic_dist_addr=%"PRIpaddr"\n" - " gic_cpu_addr=%"PRIpaddr"\n" - " gic_hyp_addr=%"PRIpaddr"\n" - " gic_vcpu_addr=%"PRIpaddr"\n" - " gic_maintenance_irq=%u\n", - gic.dbase, gic.cbase, gic.hbase, gic.vbase, - gic.maintenance_irq); - - if ( (gic.dbase & ~PAGE_MASK) || (gic.cbase & ~PAGE_MASK) || - (gic.hbase & ~PAGE_MASK) || (gic.vbase & ~PAGE_MASK) ) - panic("GIC interfaces not page aligned"); - - gic.map_dbase = ioremap_nocache(gic.dbase, PAGE_SIZE); - if ( !gic.map_dbase ) - panic("Failed to ioremap for GIC distributor\n"); - - if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 0x10); - else - gic.map_cbase = ioremap_nocache(gic.cbase, PAGE_SIZE * 2); - - if ( !gic.map_cbase ) - panic("Failed to ioremap for GIC CPU interface\n"); - - gic.map_hbase = ioremap_nocache(gic.hbase, PAGE_SIZE); - if ( !gic.map_hbase ) - panic("Failed to ioremap for GIC Virtual interface\n"); - - /* Global settings: interrupt distributor */ - spin_lock_init(&gic.lock); - spin_lock(&gic.lock); - - gic_dist_init(); - gic_cpu_init(); - gic_hyp_init(); - - spin_unlock(&gic.lock); -} - -static void send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, - const cpumask_t *cpu_mask) -{ - unsigned int mask = 0; - cpumask_t online_mask; - - switch ( irqmode ) - { - case SGI_TARGET_OTHERS: - writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); - break; - case SGI_TARGET_SELF: - writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); - break; - case SGI_TARGET_LIST: - cpumask_and(&online_mask, cpu_mask, &cpu_online_map); - mask = gic_cpu_mask(&online_mask); - writel_relaxed(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, - GICD + GICD_SGIR); - break; - default: - BUG(); - } + gicv2_init(); + /* Clear LR mask for cpu0 */ + clear_cpu_lr_mask(); } void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) @@ -526,12 +174,11 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_LIST, cpumask); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_LIST, cpumask); } void send_SGI_one(unsigned int cpu, enum gic_sgi sgi) { - ASSERT(cpu < NR_GIC_CPU_IF); /* Targets bitmap only supports 8 CPUs */ send_SGI_mask(cpumask_of(cpu), sgi); } @@ -540,7 +187,7 @@ void send_SGI_self(enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_SELF, NULL); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_SELF, NULL); } void send_SGI_allbutself(enum gic_sgi sgi) @@ -548,7 +195,7 @@ void send_SGI_allbutself(enum gic_sgi sgi) ASSERT(sgi < 16); /* There are only 16 SGIs */ dsb(sy); - send_SGI(sgi, SGI_TARGET_OTHERS, NULL); + gic_hw_ops->send_SGI(sgi, SGI_TARGET_OTHERS, NULL); } void smp_send_state_dump(unsigned int cpu) @@ -559,10 +206,9 @@ void smp_send_state_dump(unsigned int cpu) /* Set up the per-CPU parts of the GIC for a secondary CPU */ void __cpuinit gic_init_secondary_cpu(void) { - spin_lock(&gic.lock); - gic_cpu_init(); - gic_hyp_init(); - spin_unlock(&gic.lock); + gic_hw_ops->secondary_init(); + /* Clear LR mask for secondary cpus */ + clear_cpu_lr_mask(); } /* Shut down the per-CPU GIC interface */ @@ -570,28 +216,15 @@ void gic_disable_cpu(void) { ASSERT(!local_irq_is_enabled()); - spin_lock(&gic.lock); - gic_cpu_disable(); - gic_hyp_disable(); - spin_unlock(&gic.lock); + gic_hw_ops->disable_interface(); } static inline void gic_set_lr(int lr, struct pending_irq *p, - unsigned int state) + unsigned int state) { - uint32_t lr_val; - ASSERT(!local_irq_is_enabled()); - BUG_ON(lr >= nr_lrs); - BUG_ON(lr < 0); - BUG_ON(state & ~(GICH_LR_STATE_MASK<priority) << GICH_LR_PRIORITY_SHIFT) | - ((p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); - if ( p->desc != NULL ) - lr_val |= GICH_LR_HW | (p->desc->irq << GICH_LR_PHYSICAL_SHIFT); - writel_relaxed(lr_val, GICH + GICH_LR + lr * 4); + gic_hw_ops->update_lr(lr, p, state); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); @@ -651,6 +284,7 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int priority) { int i; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; ASSERT(spin_is_locked(&v->arch.vgic.lock)); @@ -670,36 +304,43 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, static void gic_update_one_lr(struct vcpu *v, int i) { struct pending_irq *p; - uint32_t lr; int irq; + struct gic_lr lr_val; ASSERT(spin_is_locked(&v->arch.vgic.lock)); ASSERT(!local_irq_is_enabled()); - lr = readl_relaxed(GICH + GICH_LR + i * 4); - irq = (lr >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; + gic_hw_ops->read_lr(i, &lr_val); + irq = lr_val.virq; p = irq_to_pending(v, irq); - if ( lr & GICH_LR_ACTIVE ) + if ( lr_val.state & GICH_LR_ACTIVE ) { set_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); if ( test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) { if ( p->desc == NULL ) - writel_relaxed(lr | GICH_LR_PENDING, GICH + GICH_LR + i * 4); + { + lr_val.state |= GICH_LR_PENDING; + gic_hw_ops->write_lr(i, &lr_val); + } else gdprintk(XENLOG_WARNING, "unable to inject hw irq=%d into d%dv%d: already active in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); } - } else if ( lr & GICH_LR_PENDING ) { + } + else if ( lr_val.state & GICH_LR_PENDING ) + { int q __attribute__ ((unused)) = test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); #ifdef GIC_DEBUG if ( q ) gdprintk(XENLOG_DEBUG, "trying to inject irq=%d into d%dv%d, when it is already pending in LR%d\n", irq, v->domain->domain_id, v->vcpu_id, i); #endif - } else { - writel_relaxed(0, GICH + GICH_LR + i * 4); + } + else + { + gic_hw_ops->clear_lr(i); clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) @@ -719,6 +360,7 @@ void gic_clear_lrs(struct vcpu *v) { int i = 0; unsigned long flags; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; /* The idle domain has no LRs to be cleared. Since gic_restore_state * doesn't write any LR registers for the idle domain they could be @@ -739,10 +381,12 @@ void gic_clear_lrs(struct vcpu *v) static void gic_restore_pending_irqs(struct vcpu *v) { - int lr = 0, lrs = nr_lrs; + int lr = 0; struct pending_irq *p, *t, *p_r; struct list_head *inflight_r; unsigned long flags; + unsigned int nr_lrs = gic_hw_ops->info->nr_lrs; + int lrs = nr_lrs; spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -807,13 +451,12 @@ int gic_events_need_delivery(void) struct vcpu *v = current; struct pending_irq *p; unsigned long flags; - const unsigned long apr = readl_relaxed(GICH + GICH_APR); + const unsigned long apr = gic_hw_ops->read_apr(0); int mask_priority; int active_priority; int rc = 0; - mask_priority = (readl_relaxed(GICH + GICH_VMCR) - >> GICH_VMCR_PRIORITY_SHIFT) & GICH_VMCR_PRIORITY_MASK; + mask_priority = gic_hw_ops->read_vmcr_priority(); active_priority = find_next_bit(&apr, 32, 0); spin_lock_irqsave(&v->arch.vgic.lock, flags); @@ -843,23 +486,23 @@ out: void gic_inject(void) { - uint32_t hcr; ASSERT(!local_irq_is_enabled()); gic_restore_pending_irqs(current); - hcr = readl_relaxed(GICH + GICH_HCR); - if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) - writel_relaxed(hcr | GICH_HCR_UIE, GICH + GICH_HCR); + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 1); else - writel_relaxed(hcr & ~GICH_HCR_UIE, GICH + GICH_HCR); + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { /* Lower the priority */ - writel_relaxed(sgi, GICC + GICC_EOIR); + struct irq_desc *desc = irq_to_desc(sgi); + + /* Lower the priority */ + gic_hw_ops->eoi_irq(desc); switch (sgi) { @@ -878,19 +521,17 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) } /* Deactivate */ - writel_relaxed(sgi, GICC + GICC_DIR); + gic_hw_ops->deactivate_irq(desc); } /* Accept an interrupt from the GIC and dispatch its handler */ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) { - uint32_t intack; unsigned int irq; - do { - intack = readl_relaxed(GICC + GICC_IAR); - irq = intack & GICC_IA_IRQ; + /* Reading IRQ will ACK it */ + irq = gic_hw_ops->read_irq(); if ( likely(irq >= 16 && irq < 1021) ) { @@ -912,49 +553,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) int gicv_setup(struct domain *d) { - int ret; - - /* - * The hardware domain gets the hardware address. - * Guests get the virtual platform layout. - */ - if ( is_hardware_domain(d) ) - { - d->arch.vgic.dbase = gic.dbase; - d->arch.vgic.cbase = gic.cbase; - } - else - { - d->arch.vgic.dbase = GUEST_GICD_BASE; - d->arch.vgic.cbase = GUEST_GICC_BASE; - } - - d->arch.vgic.nr_lines = 0; - - /* - * Map the gic virtual cpu interface in the gic cpu interface - * region of the guest. - * - * The second page is always mapped at +4K irrespective of the - * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. - */ - ret = map_mmio_regions(d, d->arch.vgic.cbase, - d->arch.vgic.cbase + PAGE_SIZE - 1, - gic.vbase); - if (ret) - return ret; - - if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gic.vbase + PAGE_SIZE); - else - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gic.vbase + 16*PAGE_SIZE); - - return ret; - + return gic_hw_ops->gicv_setup(d); } static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) @@ -969,18 +568,10 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r void gic_dump_info(struct vcpu *v) { - int i; struct pending_irq *p; printk("GICH_LRs (vcpu %d) mask=%"PRIx64"\n", v->vcpu_id, v->arch.lr_mask); - if ( v == current ) - { - for ( i = 0; i < nr_lrs; i++ ) - printk(" HW_LR[%d]=%x\n", i, readl_relaxed(GICH + GICH_LR + i * 4)); - } else { - for ( i = 0; i < nr_lrs; i++ ) - printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); - } + gic_hw_ops->dump_state(v); list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight ) { @@ -991,12 +582,11 @@ void gic_dump_info(struct vcpu *v) { printk("Pending irq=%d\n", p->irq); } - } void __cpuinit init_maintenance_interrupt(void) { - request_irq(gic.maintenance_irq, 0, maintenance_interrupt, + request_irq(gic_hw_ops->info->maintenance_irq, 0, maintenance_interrupt, "irq-maintenance", NULL); } diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 7fa3b95..9a85633 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -114,24 +114,6 @@ #define GICH_MISR_VGRP1E (1 << 6) #define GICH_MISR_VGRP1D (1 << 7) -#define GICH_LR_VIRTUAL_MASK 0x3ff -#define GICH_LR_VIRTUAL_SHIFT 0 -#define GICH_LR_PHYSICAL_MASK 0x3ff -#define GICH_LR_PHYSICAL_SHIFT 10 -#define GICH_LR_STATE_MASK 0x3 -#define GICH_LR_STATE_SHIFT 28 -#define GICH_LR_PRIORITY_SHIFT 23 -#define GICH_LR_MAINTENANCE_IRQ (1<<19) -#define GICH_LR_PENDING (1<<28) -#define GICH_LR_ACTIVE (1<<29) -#define GICH_LR_GRP1 (1<<30) -#define GICH_LR_HW (1<<31) -#define GICH_LR_CPUID_SHIFT 9 -#define GICH_VTR_NRLRGS 0x3f - -#define GICH_VMCR_PRIORITY_MASK 0x1f -#define GICH_VMCR_PRIORITY_SHIFT 27 - /* * 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 @@ -155,6 +137,8 @@ #define GIC_PRI_TO_GUEST(pri) (pri >> 3) /* GICH_LR and GICH_VMCR only support 5 bits for guest irq priority */ +#define GICH_LR_PENDING 1 +#define GICH_LR_ACTIVE 2 #ifndef __ASSEMBLY__ #include @@ -163,6 +147,28 @@ #define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") +/* + * Decode LR register content. + * The LR register format is different for GIC HW version + */ +struct gic_lr { + /* Physical IRQ */ + uint32_t pirq; + /* Virtual IRQ */ + uint32_t virq; + uint8_t priority; + uint8_t state; + uint8_t hw_status; + uint8_t grp; +}; + +enum gic_version { + GIC_V2, +}; + +extern enum gic_version gic_hw_version(void); +extern void gicv2_init(void); + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); @@ -234,6 +240,71 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type); void gic_clear_lrs(struct vcpu *v); +struct gic_info { + /* GIC version */ + enum gic_version hw_version; + /* Number of GIC lines supported */ + unsigned int nr_lines; + /* Number of LR registers */ + uint8_t nr_lrs; + /* Maintenance irq number */ + unsigned int maintenance_irq; +}; + +struct gic_hw_operations { + /* Hold GIC HW information */ + const struct gic_info *info; + /* Save GIC registers */ + void (*save_state)(struct vcpu *); + /* Restore GIC registers */ + void (*restore_state)(const struct vcpu *); + /* Dump GIC LR register information */ + void (*dump_state)(const struct vcpu *); + /* Map MMIO region of GIC */ + int (*gicv_setup)(struct domain *); + + /* hw_irq_controller to enable/disable/eoi host irq */ + hw_irq_controller *gic_host_irq_type; + + /* hw_irq_controller to enable/disable/eoi guest irq */ + hw_irq_controller *gic_guest_irq_type; + + /* End of Interrupt */ + void (*eoi_irq)(struct irq_desc *irqd); + /* Deactivate/reduce priority of irq */ + void (*deactivate_irq)(struct irq_desc *irqd); + /* Read IRQ id and Ack */ + unsigned int (*read_irq)(void); + /* Set IRQ property */ + void (*set_irq_properties)(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority); + /* Send SGI */ + void (*send_SGI)(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *online_mask); + /* Disable CPU physical and virtual interfaces */ + void (*disable_interface)(void); + /* Update LR register with state and priority */ + void (*update_lr)(int lr, const struct pending_irq *pending_irq, + unsigned int state); + /* Update HCR status register */ + void (*update_hcr_status)(uint32_t flag, bool_t set); + /* Clear LR register */ + void (*clear_lr)(int lr); + /* Read LR register and populate gic_lr structure */ + void (*read_lr)(int lr, struct gic_lr *); + /* Write LR register from gic_lr structure */ + void (*write_lr)(int lr, const struct gic_lr *); + /* Read VMCR priority */ + unsigned int (*read_vmcr_priority)(void); + /* Read APRn register */ + unsigned int (*read_apr)(int apr_reg); + /* Secondary CPU init */ + int (*secondary_init)(void); +}; + +void register_gic_ops(const struct gic_hw_operations *ops); + #endif /* __ASSEMBLY__ */ #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 Jul 05 16:54:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TDy-0002ZI-Fu; Sat, 05 Jul 2014 16:54:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDx-0002Z5-I6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:05 +0000 Received: from [85.158.137.68:22516] by server-3.bemta-3.messagelabs.com id 5B/2D-25808-CAD28B35; Sat, 05 Jul 2014 16:54:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579243!14275269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6753 invoked from network); 5 Jul 2014 16:54:04 -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 Jul 2014 16:54:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDu-0006Ld-Pp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDu-0002tX-OQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:02 +0000 Date: Sat, 05 Jul 2014 16:54:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move GIC context data structure to gic driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd982d7381d215106a1e3dc5d302666b4cd53ef7 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:12 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: move GIC context data structure to gic driver arch_domain in domain.h defines all the GIC registers that needs to be saved/restored directly. These GIC registers are GIC HW version specific. The number of registers and size of registers varies with GIC version. So move these registers to gic.h file and make a union of these registers. This helps to define GIC HW version specific structure to this union for later GIC versions. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 14 +++++++------- xen/include/asm-arm/domain.h | 5 +++-- xen/include/asm-arm/gic.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 3539cb8..c18cd4c 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -111,10 +111,10 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); - v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); + v->arch.gic.v2.apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic.v2.vmcr = readl_relaxed(GICH + GICH_VMCR); /* Disable until next VCPU scheduled */ writel_relaxed(0, GICH + GICH_HCR); } @@ -124,10 +124,10 @@ static void gicv2_restore_state(const struct vcpu *v) int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + writel_relaxed(v->arch.gic.v2.lr[i], GICH + GICH_LR + i * 4); - writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(v->arch.gic.v2.apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic.v2.vmcr, GICH + GICH_VMCR); writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); } @@ -144,7 +144,7 @@ static void gicv2_dump_state(const struct vcpu *v) else { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic.v2.lr[i]); } } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 046362c..bfd462c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -263,8 +264,8 @@ struct arch_vcpu uint32_t csselr; register_t vmpidr; - uint32_t gic_hcr, gic_vmcr, gic_apr; - uint32_t gic_lr[64]; + /* Holds gic context data */ + union gic_state_data gic; uint64_t lr_mask; struct { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 9a85633..a3c5f3d 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -148,6 +148,24 @@ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") /* + * GICv2 register that needs to be saved/restored + * on VCPU context switch + */ +struct gic_v2 { + uint32_t hcr; + uint32_t vmcr; + uint32_t apr; + uint32_t lr[64]; +}; + +/* + * Union to hold underlying hw version context information + */ +union gic_state_data { + struct gic_v2 v2; +}; + +/* * Decode LR register content. * The LR register format is different for GIC HW version */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:54:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TDy-0002ZI-Fu; Sat, 05 Jul 2014 16:54:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDx-0002Z5-I6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:05 +0000 Received: from [85.158.137.68:22516] by server-3.bemta-3.messagelabs.com id 5B/2D-25808-CAD28B35; Sat, 05 Jul 2014 16:54:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579243!14275269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6753 invoked from network); 5 Jul 2014 16:54:04 -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 Jul 2014 16:54:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TDu-0006Ld-Pp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TDu-0002tX-OQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:02 +0000 Date: Sat, 05 Jul 2014 16:54:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move GIC context data structure to gic driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd982d7381d215106a1e3dc5d302666b4cd53ef7 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:12 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: move GIC context data structure to gic driver arch_domain in domain.h defines all the GIC registers that needs to be saved/restored directly. These GIC registers are GIC HW version specific. The number of registers and size of registers varies with GIC version. So move these registers to gic.h file and make a union of these registers. This helps to define GIC HW version specific structure to this union for later GIC versions. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 14 +++++++------- xen/include/asm-arm/domain.h | 5 +++-- xen/include/asm-arm/gic.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 3539cb8..c18cd4c 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -111,10 +111,10 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic_lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); - v->arch.gic_apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic_vmcr = readl_relaxed(GICH + GICH_VMCR); + v->arch.gic.v2.apr = readl_relaxed(GICH + GICH_APR); + v->arch.gic.v2.vmcr = readl_relaxed(GICH + GICH_VMCR); /* Disable until next VCPU scheduled */ writel_relaxed(0, GICH + GICH_HCR); } @@ -124,10 +124,10 @@ static void gicv2_restore_state(const struct vcpu *v) int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_relaxed(v->arch.gic_lr[i], GICH + GICH_LR + i * 4); + writel_relaxed(v->arch.gic.v2.lr[i], GICH + GICH_LR + i * 4); - writel_relaxed(v->arch.gic_apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic_vmcr, GICH + GICH_VMCR); + writel_relaxed(v->arch.gic.v2.apr, GICH + GICH_APR); + writel_relaxed(v->arch.gic.v2.vmcr, GICH + GICH_VMCR); writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); } @@ -144,7 +144,7 @@ static void gicv2_dump_state(const struct vcpu *v) else { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]); + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic.v2.lr[i]); } } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 046362c..bfd462c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -263,8 +264,8 @@ struct arch_vcpu uint32_t csselr; register_t vmpidr; - uint32_t gic_hcr, gic_vmcr, gic_apr; - uint32_t gic_lr[64]; + /* Holds gic context data */ + union gic_state_data gic; uint64_t lr_mask; struct { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 9a85633..a3c5f3d 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -148,6 +148,24 @@ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") /* + * GICv2 register that needs to be saved/restored + * on VCPU context switch + */ +struct gic_v2 { + uint32_t hcr; + uint32_t vmcr; + uint32_t apr; + uint32_t lr[64]; +}; + +/* + * Union to hold underlying hw version context information + */ +union gic_state_data { + struct gic_v2 v2; +}; + +/* * Decode LR register content. * The LR register format is different for GIC HW version */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:54:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE8-0002az-Ij; Sat, 05 Jul 2014 16:54:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE7-0002ak-OF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:15 +0000 Received: from [85.158.139.211:22592] by server-10.bemta-5.messagelabs.com id C2/65-10247-7BD28B35; Sat, 05 Jul 2014 16:54:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1404579253!13838533!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13690 invoked from network); 5 Jul 2014 16:54:14 -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; 5 Jul 2014 16:54:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE4-0006Lj-UK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TE4-0002uS-TK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:12 +0000 Date: Sat, 05 Jul 2014 16:54:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use device api to detect GIC 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 2df0c4c491b93207657fdabbb390702a43a5bee6 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:13 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: use device api to detect GIC version Run through the device tree to detect compatible GIC version and initialize GIC driver Also change DT_MATCH_GIC to DT_MATCH_GIC_V2 to point the GIC HW version to add later GIC versions Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/gic-v2.c | 27 ++++++++++++++++----------- xen/arch/arm/gic.c | 25 ++++++++++++++++++++++++- xen/include/asm-arm/device.h | 1 + xen/include/asm-arm/gic.h | 9 +++++---- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9d9cba9..8c850ca 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -804,7 +804,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, }; static const struct dt_device_match gic_matches[] __initconst = { - DT_MATCH_GIC, + DT_MATCH_GIC_V2, { /* sentinel */ }, }; static const struct dt_device_match timer_matches[] __initconst = diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index c18cd4c..695c232 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -584,20 +585,10 @@ const static struct gic_hw_operations gicv2_ops = { }; /* Set up the GIC */ -void __init gicv2_init(void) +static int __init gicv2_init(struct dt_device_node *node, const void *data) { - static const struct dt_device_match gic_ids[] __initconst = - { - DT_MATCH_GIC, - { /* sentinel */ }, - }; - struct dt_device_node *node; int res; - node = dt_find_interrupt_controller(gic_ids); - if ( !node ) - panic("GICv2: Unable to find compatible GIC in the device tree"); - dt_device_set_used_by(node, DOMID_XEN); res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); @@ -667,8 +658,22 @@ void __init gicv2_init(void) gicv2_info.hw_version = GIC_V2; register_gic_ops(&gicv2_ops); + + return 0; } +static const char * const gicv2_dt_compat[] __initconst = +{ + DT_COMPAT_GIC_CORTEX_A15, + DT_COMPAT_GIC_CORTEX_A7, + NULL +}; + +DT_DEVICE_START(gicv2, "GICv2:", DEVICE_GIC) + .compatible = gicv2_dt_compat, + .init = gicv2_init, +DT_DEVICE_END + /* * Local variables: * mode: C diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 3624391..e1e27b35 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -164,7 +165,29 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { - gicv2_init(); + int rc; + struct dt_device_node *node; + uint8_t num_gics = 0; + + dt_for_each_device_node( dt_host, node ) + { + if ( !dt_get_property(node, "interrupt-controller", NULL) ) + continue; + + if ( !dt_get_parent(node) ) + continue; + + rc = device_init(node, DEVICE_GIC, NULL); + if ( !rc ) + { + /* NOTE: Only one GIC is supported */ + num_gics = 1; + break; + } + } + if ( !num_gics ) + panic("Unable to find compatible GIC in the device tree"); + /* Clear LR mask for cpu0 */ clear_cpu_lr_mask(); } diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 60109cc..74a80c6 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -8,6 +8,7 @@ enum device_type { DEVICE_SERIAL, DEVICE_IOMMU, + DEVICE_GIC, /* Use for error */ DEVICE_UNKNOWN, }; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index a3c5f3d..5ff4477 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -144,8 +144,11 @@ #include #include -#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ - DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") +#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" +#define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" + +#define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7) /* * GICv2 register that needs to be saved/restored @@ -185,8 +188,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern void gicv2_init(void); - extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(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 Jul 05 16:54:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE8-0002az-Ij; Sat, 05 Jul 2014 16:54:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE7-0002ak-OF for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:15 +0000 Received: from [85.158.139.211:22592] by server-10.bemta-5.messagelabs.com id C2/65-10247-7BD28B35; Sat, 05 Jul 2014 16:54:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1404579253!13838533!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13690 invoked from network); 5 Jul 2014 16:54:14 -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; 5 Jul 2014 16:54:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TE4-0006Lj-UK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TE4-0002uS-TK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:12 +0000 Date: Sat, 05 Jul 2014 16:54:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use device api to detect GIC 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 2df0c4c491b93207657fdabbb390702a43a5bee6 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:13 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: use device api to detect GIC version Run through the device tree to detect compatible GIC version and initialize GIC driver Also change DT_MATCH_GIC to DT_MATCH_GIC_V2 to point the GIC HW version to add later GIC versions Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/gic-v2.c | 27 ++++++++++++++++----------- xen/arch/arm/gic.c | 25 ++++++++++++++++++++++++- xen/include/asm-arm/device.h | 1 + xen/include/asm-arm/gic.h | 9 +++++---- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9d9cba9..8c850ca 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -804,7 +804,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, }; static const struct dt_device_match gic_matches[] __initconst = { - DT_MATCH_GIC, + DT_MATCH_GIC_V2, { /* sentinel */ }, }; static const struct dt_device_match timer_matches[] __initconst = diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index c18cd4c..695c232 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -584,20 +585,10 @@ const static struct gic_hw_operations gicv2_ops = { }; /* Set up the GIC */ -void __init gicv2_init(void) +static int __init gicv2_init(struct dt_device_node *node, const void *data) { - static const struct dt_device_match gic_ids[] __initconst = - { - DT_MATCH_GIC, - { /* sentinel */ }, - }; - struct dt_device_node *node; int res; - node = dt_find_interrupt_controller(gic_ids); - if ( !node ) - panic("GICv2: Unable to find compatible GIC in the device tree"); - dt_device_set_used_by(node, DOMID_XEN); res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); @@ -667,8 +658,22 @@ void __init gicv2_init(void) gicv2_info.hw_version = GIC_V2; register_gic_ops(&gicv2_ops); + + return 0; } +static const char * const gicv2_dt_compat[] __initconst = +{ + DT_COMPAT_GIC_CORTEX_A15, + DT_COMPAT_GIC_CORTEX_A7, + NULL +}; + +DT_DEVICE_START(gicv2, "GICv2:", DEVICE_GIC) + .compatible = gicv2_dt_compat, + .init = gicv2_init, +DT_DEVICE_END + /* * Local variables: * mode: C diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 3624391..e1e27b35 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -164,7 +165,29 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { - gicv2_init(); + int rc; + struct dt_device_node *node; + uint8_t num_gics = 0; + + dt_for_each_device_node( dt_host, node ) + { + if ( !dt_get_property(node, "interrupt-controller", NULL) ) + continue; + + if ( !dt_get_parent(node) ) + continue; + + rc = device_init(node, DEVICE_GIC, NULL); + if ( !rc ) + { + /* NOTE: Only one GIC is supported */ + num_gics = 1; + break; + } + } + if ( !num_gics ) + panic("Unable to find compatible GIC in the device tree"); + /* Clear LR mask for cpu0 */ clear_cpu_lr_mask(); } diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 60109cc..74a80c6 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -8,6 +8,7 @@ enum device_type { DEVICE_SERIAL, DEVICE_IOMMU, + DEVICE_GIC, /* Use for error */ DEVICE_UNKNOWN, }; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index a3c5f3d..5ff4477 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -144,8 +144,11 @@ #include #include -#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ - DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") +#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" +#define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" + +#define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7) /* * GICv2 register that needs to be saved/restored @@ -185,8 +188,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern void gicv2_init(void); - extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(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 Jul 05 16:54:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEI-0002cj-M1; Sat, 05 Jul 2014 16:54:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEH-0002cU-Tv for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:26 +0000 Received: from [85.158.143.35:15263] by server-1.bemta-4.messagelabs.com id 0E/38-09496-1CD28B35; Sat, 05 Jul 2014 16:54:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1404579263!16025105!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21077 invoked from network); 5 Jul 2014 16:54:24 -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; 5 Jul 2014 16:54:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEF-0006Lw-2b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEF-0002uo-1a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:23 +0000 Date: Sat, 05 Jul 2014 16:54:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: switch to dynamic allocation of vgic rank X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1556868967e217a563e50ee689b995257aef574 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:14 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: switch to dynamic allocation of vgic rank vgic_irq_rank structure contains gic specific data elements. Move this out of domain.h to new vgic header file vgic.h Allocate memory dynamically in vgic driver. This patch reduces the size of domain struct and helps to keep domain struct within PAGE_SIZE when future GIC hw versions are added Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 2 ++ xen/arch/arm/vgic.c | 18 ++++++++++++++---- xen/include/asm-arm/domain.h | 11 +---------- xen/include/asm-arm/vgic.h | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 74fadbd..829d49f 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -31,6 +31,7 @@ #include #include +#include #include #include "vtimer.h" #include "vuart.h" @@ -485,6 +486,7 @@ fail: void vcpu_destroy(struct vcpu *v) { vcpu_timer_destroy(v); + vcpu_vgic_free(v); free_xenheap_pages(v->arch.stack, STACK_ORDER); } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 139c2e9..088ded3 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -29,6 +29,7 @@ #include #include +#include #define REG(n) (n) @@ -69,7 +70,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) int rank = REG_RANK_NR(b, (n >> 2)); if ( rank == 0 ) - return &v->arch.vgic.private_irqs; + return v->arch.vgic.private_irqs; else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) return &v->domain->arch.vgic.shared_irqs[rank - 1]; else @@ -139,9 +140,12 @@ void domain_vgic_free(struct domain *d) int vcpu_vgic_init(struct vcpu *v) { int i; - memset(&v->arch.vgic.private_irqs, 0, sizeof(v->arch.vgic.private_irqs)); - spin_lock_init(&v->arch.vgic.private_irqs.lock); + v->arch.vgic.private_irqs = xzalloc(struct vgic_irq_rank); + if ( v->arch.vgic.private_irqs == NULL ) + return -ENOMEM; + + spin_lock_init(&v->arch.vgic.private_irqs->lock); memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) @@ -152,7 +156,7 @@ int vcpu_vgic_init(struct vcpu *v) /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs.itargets[i] = + v->arch.vgic.private_irqs->itargets[i] = (1<<(v->vcpu_id+0)) | (1<<(v->vcpu_id+8)) | (1<<(v->vcpu_id+16)) @@ -164,6 +168,12 @@ int vcpu_vgic_init(struct vcpu *v) return 0; } +int vcpu_vgic_free(struct vcpu *v) +{ + xfree(v->arch.vgic.private_irqs); + return 0; +} + #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bfd462c..077ac1e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -13,15 +13,6 @@ #include #include -/* Represents state corresponding to a block of 32 interrupts */ -struct vgic_irq_rank { - spinlock_t lock; /* Covers access to all other members of this struct */ - uint32_t ienable, iactive, ipend, pendsgi; - uint32_t icfg[2]; - uint32_t ipriority[8]; - uint32_t itargets[8]; -}; - struct pending_irq { /* @@ -274,7 +265,7 @@ struct arch_vcpu * struct arch_domain. */ struct pending_irq pending_irqs[32]; - struct vgic_irq_rank private_irqs; + struct vgic_irq_rank *private_irqs; /* This list is ordered by IRQ priority and it is used to keep * track of the IRQs that the VGIC injected into the guest. diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h new file mode 100644 index 0000000..0fd5b41 --- /dev/null +++ b/xen/include/asm-arm/vgic.h @@ -0,0 +1,40 @@ +/* + * ARM Virtual Generic Interrupt Controller support + * + * Ian Campbell + * Copyright (c) 2011 Citrix Systems. + * + * 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. + */ + +#ifndef __ASM_ARM_VGIC_H__ +#define __ASM_ARM_VGIC_H__ + +/* Represents state corresponding to a block of 32 interrupts */ +struct vgic_irq_rank { + spinlock_t lock; /* Covers access to all other members of this struct */ + uint32_t ienable, iactive, ipend, pendsgi; + uint32_t icfg[2]; + uint32_t ipriority[8]; + uint32_t itargets[8]; +}; + +extern int vcpu_vgic_free(struct vcpu *v); +#endif /* __ASM_ARM_VGIC_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 Jul 05 16:54:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEI-0002cj-M1; Sat, 05 Jul 2014 16:54:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEH-0002cU-Tv for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:26 +0000 Received: from [85.158.143.35:15263] by server-1.bemta-4.messagelabs.com id 0E/38-09496-1CD28B35; Sat, 05 Jul 2014 16:54:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1404579263!16025105!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21077 invoked from network); 5 Jul 2014 16:54:24 -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; 5 Jul 2014 16:54:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEF-0006Lw-2b for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEF-0002uo-1a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:23 +0000 Date: Sat, 05 Jul 2014 16:54:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: switch to dynamic allocation of vgic rank X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1556868967e217a563e50ee689b995257aef574 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:14 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: switch to dynamic allocation of vgic rank vgic_irq_rank structure contains gic specific data elements. Move this out of domain.h to new vgic header file vgic.h Allocate memory dynamically in vgic driver. This patch reduces the size of domain struct and helps to keep domain struct within PAGE_SIZE when future GIC hw versions are added Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 2 ++ xen/arch/arm/vgic.c | 18 ++++++++++++++---- xen/include/asm-arm/domain.h | 11 +---------- xen/include/asm-arm/vgic.h | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 74fadbd..829d49f 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -31,6 +31,7 @@ #include #include +#include #include #include "vtimer.h" #include "vuart.h" @@ -485,6 +486,7 @@ fail: void vcpu_destroy(struct vcpu *v) { vcpu_timer_destroy(v); + vcpu_vgic_free(v); free_xenheap_pages(v->arch.stack, STACK_ORDER); } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 139c2e9..088ded3 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -29,6 +29,7 @@ #include #include +#include #define REG(n) (n) @@ -69,7 +70,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) int rank = REG_RANK_NR(b, (n >> 2)); if ( rank == 0 ) - return &v->arch.vgic.private_irqs; + return v->arch.vgic.private_irqs; else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) return &v->domain->arch.vgic.shared_irqs[rank - 1]; else @@ -139,9 +140,12 @@ void domain_vgic_free(struct domain *d) int vcpu_vgic_init(struct vcpu *v) { int i; - memset(&v->arch.vgic.private_irqs, 0, sizeof(v->arch.vgic.private_irqs)); - spin_lock_init(&v->arch.vgic.private_irqs.lock); + v->arch.vgic.private_irqs = xzalloc(struct vgic_irq_rank); + if ( v->arch.vgic.private_irqs == NULL ) + return -ENOMEM; + + spin_lock_init(&v->arch.vgic.private_irqs->lock); memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) @@ -152,7 +156,7 @@ int vcpu_vgic_init(struct vcpu *v) /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs.itargets[i] = + v->arch.vgic.private_irqs->itargets[i] = (1<<(v->vcpu_id+0)) | (1<<(v->vcpu_id+8)) | (1<<(v->vcpu_id+16)) @@ -164,6 +168,12 @@ int vcpu_vgic_init(struct vcpu *v) return 0; } +int vcpu_vgic_free(struct vcpu *v) +{ + xfree(v->arch.vgic.private_irqs); + return 0; +} + #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bfd462c..077ac1e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -13,15 +13,6 @@ #include #include -/* Represents state corresponding to a block of 32 interrupts */ -struct vgic_irq_rank { - spinlock_t lock; /* Covers access to all other members of this struct */ - uint32_t ienable, iactive, ipend, pendsgi; - uint32_t icfg[2]; - uint32_t ipriority[8]; - uint32_t itargets[8]; -}; - struct pending_irq { /* @@ -274,7 +265,7 @@ struct arch_vcpu * struct arch_domain. */ struct pending_irq pending_irqs[32]; - struct vgic_irq_rank private_irqs; + struct vgic_irq_rank *private_irqs; /* This list is ordered by IRQ priority and it is used to keep * track of the IRQs that the VGIC injected into the guest. diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h new file mode 100644 index 0000000..0fd5b41 --- /dev/null +++ b/xen/include/asm-arm/vgic.h @@ -0,0 +1,40 @@ +/* + * ARM Virtual Generic Interrupt Controller support + * + * Ian Campbell + * Copyright (c) 2011 Citrix Systems. + * + * 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. + */ + +#ifndef __ASM_ARM_VGIC_H__ +#define __ASM_ARM_VGIC_H__ + +/* Represents state corresponding to a block of 32 interrupts */ +struct vgic_irq_rank { + spinlock_t lock; /* Covers access to all other members of this struct */ + uint32_t ienable, iactive, ipend, pendsgi; + uint32_t icfg[2]; + uint32_t ipriority[8]; + uint32_t itargets[8]; +}; + +extern int vcpu_vgic_free(struct vcpu *v); +#endif /* __ASM_ARM_VGIC_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 Jul 05 16:54:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TET-0002eH-Op; Sat, 05 Jul 2014 16:54:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TES-0002e2-62 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:36 +0000 Received: from [85.158.137.68:63726] by server-3.bemta-3.messagelabs.com id 88/5D-25808-BCD28B35; Sat, 05 Jul 2014 16:54:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404579273!14244324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2507 invoked from network); 5 Jul 2014 16:54:34 -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; 5 Jul 2014 16:54:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEP-0006M4-74 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEP-0002vF-60 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:33 +0000 Date: Sat, 05 Jul 2014 16:54:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: prefix byte_read and byte_write functions with vgic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28b9ee72d95ef000de89dcfa0e88f272c6a586c6 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:15 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: prefix byte_read and byte_write functions with vgic prefix byte_read and byte_write vgic functions with vgic_ to make these function vgic specific. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 088ded3..d01f1d9 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -180,7 +180,7 @@ int vcpu_vgic_free(struct vcpu *v) #define vgic_lock_rank(v, r) spin_lock(&(r)->lock) #define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) -static uint32_t byte_read(uint32_t val, int sign, int offset) +static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) { int byte = offset & 0x3; @@ -192,7 +192,7 @@ static uint32_t byte_read(uint32_t val, int sign, int offset) return val; } -static void byte_write(uint32_t *reg, uint32_t var, int offset) +static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) { int byte = offset & 0x3; @@ -267,7 +267,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -276,7 +276,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -306,7 +306,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -318,7 +318,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -346,7 +346,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -355,7 +355,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -618,8 +618,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = *r; else - byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR); + vgic_byte_write(&rank->itargets[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -631,8 +633,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)] = *r; else - byte_write(&rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR); + vgic_byte_write(&rank->ipriority[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -757,7 +761,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:54:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TET-0002eH-Op; Sat, 05 Jul 2014 16:54:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TES-0002e2-62 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:36 +0000 Received: from [85.158.137.68:63726] by server-3.bemta-3.messagelabs.com id 88/5D-25808-BCD28B35; Sat, 05 Jul 2014 16:54:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1404579273!14244324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2507 invoked from network); 5 Jul 2014 16:54:34 -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; 5 Jul 2014 16:54:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEP-0006M4-74 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEP-0002vF-60 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:33 +0000 Date: Sat, 05 Jul 2014 16:54:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: prefix byte_read and byte_write functions with vgic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28b9ee72d95ef000de89dcfa0e88f272c6a586c6 Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:15 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: prefix byte_read and byte_write functions with vgic prefix byte_read and byte_write vgic functions with vgic_ to make these function vgic specific. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 088ded3..d01f1d9 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -180,7 +180,7 @@ int vcpu_vgic_free(struct vcpu *v) #define vgic_lock_rank(v, r) spin_lock(&(r)->lock) #define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) -static uint32_t byte_read(uint32_t val, int sign, int offset) +static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) { int byte = offset & 0x3; @@ -192,7 +192,7 @@ static uint32_t byte_read(uint32_t val, int sign, int offset) return val; } -static void byte_write(uint32_t *reg, uint32_t var, int offset) +static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) { int byte = offset & 0x3; @@ -267,7 +267,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -276,7 +276,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -306,7 +306,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -318,7 +318,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -346,7 +346,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -355,7 +355,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -618,8 +618,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = *r; else - byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR); + vgic_byte_write(&rank->itargets[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -631,8 +633,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)] = *r; else - byte_write(&rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR); + vgic_byte_write(&rank->ipriority[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -757,7 +761,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:54:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEd-0002fi-Rk; Sat, 05 Jul 2014 16:54:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEc-0002fY-Hk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:46 +0000 Received: from [85.158.139.211:23396] by server-15.bemta-5.messagelabs.com id 6A/36-19516-5DD28B35; Sat, 05 Jul 2014 16:54:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404579283!13814871!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3512 invoked from network); 5 Jul 2014 16:54:44 -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; 5 Jul 2014 16:54:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEZ-0006ME-FR for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEZ-0002vc-Ac for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:43 +0000 Date: Sat, 05 Jul 2014 16:54:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move vgic defines to vgic header 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 1f83dbf0b514372265156a42fb6521a89bcb0aaa Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:16 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: move vgic defines to vgic header file gic.h contains defines of vgic. Move these to vgic header file. Also move inline functions and defines/macros in vgic.c to vgic.h. These vgic functions and macros can be used by other GIC HW specific VGIC drivers, Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/irq.c | 1 + xen/arch/arm/time.c | 1 + xen/arch/arm/vgic.c | 53 -------------------------------------- xen/arch/arm/vpsci.c | 1 + xen/arch/arm/vtimer.c | 1 + xen/include/asm-arm/gic.h | 7 ----- xen/include/asm-arm/vgic.h | 61 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 65 insertions(+), 60 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 9c141bc..3a8acbf 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -26,6 +26,7 @@ #include #include +#include static unsigned int local_irqs_type[NR_LOCAL_IRQS]; static DEFINE_SPINLOCK(local_irqs_type_lock); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 06cc709..4c3e1a6 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d01f1d9..96bd7c1 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -33,35 +33,10 @@ #define REG(n) (n) -/* Number of ranks of interrupt registers for a domain */ -#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); /* - * Rank containing GICD_ for GICD_ with - * -bits-per-interrupt - */ -static inline int REG_RANK_NR(int b, uint32_t n) -{ - switch ( b ) - { - case 8: return n >> 3; - case 4: return n >> 2; - case 2: return n >> 1; - case 1: return n; - default: BUG(); - } -} - -/* - * Offset of GICD_ with its rank, for GICD_ with - * -bits-per-interrupt. - */ -#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) - -/* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ @@ -174,34 +149,6 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } -#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) -#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) - -#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) -#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) - -static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) -{ - int byte = offset & 0x3; - - val = val >> (8*byte); - if ( sign && (val & 0x80) ) - val |= 0xffffff00; - else - val &= 0x000000ff; - return val; -} - -static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) -{ - int byte = offset & 0x3; - - var &= (0xff << (8*byte)); - - *reg &= ~(0xff << (8*byte)); - *reg |= var; -} - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) { struct hsr_dabt dabt = info->dabt; diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 1ceb8cb..80678f6 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -16,6 +16,7 @@ #include #include +#include #include int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index c268873..690657b 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -24,6 +24,7 @@ #include #include #include +#include #include extern s_time_t ticks_to_ns(uint64_t ticks); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 5ff4477..ed610cb 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -188,13 +188,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern int domain_vgic_init(struct domain *d); -extern void domain_vgic_free(struct domain *d); - -extern int vcpu_vgic_init(struct vcpu *v); - -extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); -extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt */ diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0fd5b41..92f1e86 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -18,6 +18,8 @@ #ifndef __ASM_ARM_VGIC_H__ #define __ASM_ARM_VGIC_H__ +#include + /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ @@ -27,6 +29,65 @@ struct vgic_irq_rank { uint32_t itargets[8]; }; +/* Number of ranks of interrupt registers for a domain */ +#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) + +#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) +#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) + +#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) +#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) + +/* + * Rank containing GICD_ for GICD_ with + * -bits-per-interrupt + */ +static inline int REG_RANK_NR(int b, uint32_t n) +{ + switch ( b ) + { + case 8: return n >> 3; + case 4: return n >> 2; + case 2: return n >> 1; + case 1: return n; + default: BUG(); + } +} + +static inline uint32_t vgic_byte_read(uint32_t val, int sign, int offset) +{ + int byte = offset & 0x3; + + val = val >> (8*byte); + if ( sign && (val & 0x80) ) + val |= 0xffffff00; + else + val &= 0x000000ff; + return val; +} + +static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) +{ + int byte = offset & 0x3; + + var &= (0xff << (8*byte)); + + *reg &= ~(0xff << (8*byte)); + *reg |= var; +} + +/* + * Offset of GICD_ with its rank, for GICD_ with + * -bits-per-interrupt. + */ +#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) + +extern int domain_vgic_init(struct domain *d); +extern void domain_vgic_free(struct domain *d); +extern int vcpu_vgic_init(struct vcpu *v); +extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); +extern void vgic_clear_pending_irqs(struct vcpu *v); + extern int vcpu_vgic_free(struct vcpu *v); #endif /* __ASM_ARM_VGIC_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 Jul 05 16:54:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEd-0002fi-Rk; Sat, 05 Jul 2014 16:54:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEc-0002fY-Hk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:46 +0000 Received: from [85.158.139.211:23396] by server-15.bemta-5.messagelabs.com id 6A/36-19516-5DD28B35; Sat, 05 Jul 2014 16:54:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404579283!13814871!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3512 invoked from network); 5 Jul 2014 16:54:44 -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; 5 Jul 2014 16:54:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEZ-0006ME-FR for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEZ-0002vc-Ac for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:43 +0000 Date: Sat, 05 Jul 2014 16:54:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move vgic defines to vgic header 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 1f83dbf0b514372265156a42fb6521a89bcb0aaa Author: Vijaya Kumar K AuthorDate: Tue Jul 1 12:11:16 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 2 12:27:06 2014 +0100 xen/arm: move vgic defines to vgic header file gic.h contains defines of vgic. Move these to vgic header file. Also move inline functions and defines/macros in vgic.c to vgic.h. These vgic functions and macros can be used by other GIC HW specific VGIC drivers, Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/irq.c | 1 + xen/arch/arm/time.c | 1 + xen/arch/arm/vgic.c | 53 -------------------------------------- xen/arch/arm/vpsci.c | 1 + xen/arch/arm/vtimer.c | 1 + xen/include/asm-arm/gic.h | 7 ----- xen/include/asm-arm/vgic.h | 61 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 65 insertions(+), 60 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 9c141bc..3a8acbf 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -26,6 +26,7 @@ #include #include +#include static unsigned int local_irqs_type[NR_LOCAL_IRQS]; static DEFINE_SPINLOCK(local_irqs_type_lock); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 06cc709..4c3e1a6 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d01f1d9..96bd7c1 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -33,35 +33,10 @@ #define REG(n) (n) -/* Number of ranks of interrupt registers for a domain */ -#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); /* - * Rank containing GICD_ for GICD_ with - * -bits-per-interrupt - */ -static inline int REG_RANK_NR(int b, uint32_t n) -{ - switch ( b ) - { - case 8: return n >> 3; - case 4: return n >> 2; - case 2: return n >> 1; - case 1: return n; - default: BUG(); - } -} - -/* - * Offset of GICD_ with its rank, for GICD_ with - * -bits-per-interrupt. - */ -#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) - -/* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ @@ -174,34 +149,6 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } -#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) -#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) - -#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) -#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) - -static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) -{ - int byte = offset & 0x3; - - val = val >> (8*byte); - if ( sign && (val & 0x80) ) - val |= 0xffffff00; - else - val &= 0x000000ff; - return val; -} - -static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) -{ - int byte = offset & 0x3; - - var &= (0xff << (8*byte)); - - *reg &= ~(0xff << (8*byte)); - *reg |= var; -} - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) { struct hsr_dabt dabt = info->dabt; diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 1ceb8cb..80678f6 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -16,6 +16,7 @@ #include #include +#include #include int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index c268873..690657b 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -24,6 +24,7 @@ #include #include #include +#include #include extern s_time_t ticks_to_ns(uint64_t ticks); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 5ff4477..ed610cb 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -188,13 +188,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern int domain_vgic_init(struct domain *d); -extern void domain_vgic_free(struct domain *d); - -extern int vcpu_vgic_init(struct vcpu *v); - -extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); -extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt */ diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0fd5b41..92f1e86 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -18,6 +18,8 @@ #ifndef __ASM_ARM_VGIC_H__ #define __ASM_ARM_VGIC_H__ +#include + /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ @@ -27,6 +29,65 @@ struct vgic_irq_rank { uint32_t itargets[8]; }; +/* Number of ranks of interrupt registers for a domain */ +#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) + +#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) +#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) + +#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) +#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) + +/* + * Rank containing GICD_ for GICD_ with + * -bits-per-interrupt + */ +static inline int REG_RANK_NR(int b, uint32_t n) +{ + switch ( b ) + { + case 8: return n >> 3; + case 4: return n >> 2; + case 2: return n >> 1; + case 1: return n; + default: BUG(); + } +} + +static inline uint32_t vgic_byte_read(uint32_t val, int sign, int offset) +{ + int byte = offset & 0x3; + + val = val >> (8*byte); + if ( sign && (val & 0x80) ) + val |= 0xffffff00; + else + val &= 0x000000ff; + return val; +} + +static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) +{ + int byte = offset & 0x3; + + var &= (0xff << (8*byte)); + + *reg &= ~(0xff << (8*byte)); + *reg |= var; +} + +/* + * Offset of GICD_ with its rank, for GICD_ with + * -bits-per-interrupt. + */ +#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) + +extern int domain_vgic_init(struct domain *d); +extern void domain_vgic_free(struct domain *d); +extern int vcpu_vgic_init(struct vcpu *v); +extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); +extern void vgic_clear_pending_irqs(struct vcpu *v); + extern int vcpu_vgic_free(struct vcpu *v); #endif /* __ASM_ARM_VGIC_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 Jul 05 16:54:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEo-0002hc-0N; Sat, 05 Jul 2014 16:54:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEm-0002hK-99 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:56 +0000 Received: from [85.158.137.68:2705] by server-5.bemta-3.messagelabs.com id 0B/04-02401-FDD28B35; Sat, 05 Jul 2014 16:54:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404579293!9773417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7864 invoked from network); 5 Jul 2014 16:54:54 -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; 5 Jul 2014 16:54:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEj-0006MN-L6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEj-0002vz-JP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:53 +0000 Date: Sat, 05 Jul 2014 16:54:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: fix incorrect {, un}likely() 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 7915fc1587eb61c64499d025e52ab1c665be44d7 Author: Andrew Cooper AuthorDate: Wed Jul 2 14:46:42 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:46:42 2014 +0200 minios: fix incorrect {, un}likely() definitions As identified in e5545fb6, likely() and unlikely() must convert their expressions to booleans before comparing to 1 or 0, to avoid truncation issues. While editing this file, add inclusion guards. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- extras/mini-os/include/compiler.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os/include/compiler.h index e35c9d5..4188277 100644 --- a/extras/mini-os/include/compiler.h +++ b/extras/mini-os/include/compiler.h @@ -1,5 +1,10 @@ +#ifndef __MINIOS_COMPILER_H_ +#define __MINIOS_COMPILER_H_ + #if __GNUC__ == 2 && __GNUC_MINOR__ < 96 #define __builtin_expect(x, expected_value) (x) #endif -#define unlikely(x) __builtin_expect((x),0) -#define likely(x) __builtin_expect((x),1) +#define unlikely(x) __builtin_expect(!!(x),0) +#define likely(x) __builtin_expect(!!(x),1) + +#endif /* __MINIOS_COMPILER_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 Jul 05 16:54:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:54: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 1X3TEo-0002hc-0N; Sat, 05 Jul 2014 16:54:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEm-0002hK-99 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:56 +0000 Received: from [85.158.137.68:2705] by server-5.bemta-3.messagelabs.com id 0B/04-02401-FDD28B35; Sat, 05 Jul 2014 16:54:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404579293!9773417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7864 invoked from network); 5 Jul 2014 16:54:54 -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; 5 Jul 2014 16:54:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEj-0006MN-L6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEj-0002vz-JP for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:54:53 +0000 Date: Sat, 05 Jul 2014 16:54:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: fix incorrect {, un}likely() 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 7915fc1587eb61c64499d025e52ab1c665be44d7 Author: Andrew Cooper AuthorDate: Wed Jul 2 14:46:42 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:46:42 2014 +0200 minios: fix incorrect {, un}likely() definitions As identified in e5545fb6, likely() and unlikely() must convert their expressions to booleans before comparing to 1 or 0, to avoid truncation issues. While editing this file, add inclusion guards. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- extras/mini-os/include/compiler.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os/include/compiler.h index e35c9d5..4188277 100644 --- a/extras/mini-os/include/compiler.h +++ b/extras/mini-os/include/compiler.h @@ -1,5 +1,10 @@ +#ifndef __MINIOS_COMPILER_H_ +#define __MINIOS_COMPILER_H_ + #if __GNUC__ == 2 && __GNUC_MINOR__ < 96 #define __builtin_expect(x, expected_value) (x) #endif -#define unlikely(x) __builtin_expect((x),0) -#define likely(x) __builtin_expect((x),1) +#define unlikely(x) __builtin_expect(!!(x),0) +#define likely(x) __builtin_expect(!!(x),1) + +#endif /* __MINIOS_COMPILER_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 Jul 05 16:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TF3-0002jp-3M; Sat, 05 Jul 2014 16:55:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TF2-0002ji-2U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:12 +0000 Received: from [85.158.137.68:64458] by server-2.bemta-3.messagelabs.com id 42/9B-14008-FED28B35; Sat, 05 Jul 2014 16:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1404579309!14200313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11000 invoked from network); 5 Jul 2014 16:55:10 -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; 5 Jul 2014 16:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEz-0006Mw-89 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEt-0002we-Oj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:03 +0000 Date: Sat, 05 Jul 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: always store APIC ID of 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 c66a35b837d0799a1451668203744c61ddd3a356 Author: Jan Beulich AuthorDate: Wed Jul 2 14:48:13 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:48:13 2014 +0200 x86: always store APIC ID of CPU So far for non-Intel CPUs struct cpuinfo_x86's apicid field didn't get set, despite MCE code consuming it. Do some formatting/ordering adjustment to the touched code at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 18112f2..f1efacc 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -152,6 +152,17 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) this_cpu = &default_cpu; } +/* + * cpuid returns the value latched in the HW at reset, not the APIC ID + * register's value. For any box whose BIOS changes APIC IDs, like + * clustered APIC systems, we must use hard_smp_processor_id. + * + * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. + */ +static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) +{ + return hard_smp_processor_id() >> index_msb; +} /* Do minimum CPU detection early. Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment. @@ -216,6 +227,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) if (c->x86 >= 0x6) c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_mask = tfms & 15; + c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -339,17 +351,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) } } -/* cpuid returns the value latched in the HW at reset, not the APIC ID - * register's value. For any box whose BIOS changes APIC IDs, like - * clustered APIC systems, we must use hard_smp_processor_id. - * - * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. - */ -static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) -{ - return hard_smp_processor_id() >> index_msb; -} - /* leaf 0xb SMT level */ #define SMT_LEVEL 0 @@ -429,14 +430,12 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; int index_msb, core_bits; - cpuid(1, &eax, &ebx, &ecx, &edx); - - c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); - - if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY) - || cpu_has(c, X86_FEATURE_XTOPOLOGY)) + if (!cpu_has(c, X86_FEATURE_HT) || + cpu_has(c, X86_FEATURE_CMP_LEGACY) || + cpu_has(c, X86_FEATURE_XTOPOLOGY)) return; + cpuid(1, &eax, &ebx, &ecx, &edx); c->x86_num_siblings = (ebx & 0xff0000) >> 16; if (c->x86_num_siblings == 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 Jul 05 16:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TF3-0002jp-3M; Sat, 05 Jul 2014 16:55:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TF2-0002ji-2U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:12 +0000 Received: from [85.158.137.68:64458] by server-2.bemta-3.messagelabs.com id 42/9B-14008-FED28B35; Sat, 05 Jul 2014 16:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1404579309!14200313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11000 invoked from network); 5 Jul 2014 16:55:10 -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; 5 Jul 2014 16:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TEz-0006Mw-89 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TEt-0002we-Oj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:03 +0000 Date: Sat, 05 Jul 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: always store APIC ID of 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 c66a35b837d0799a1451668203744c61ddd3a356 Author: Jan Beulich AuthorDate: Wed Jul 2 14:48:13 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:48:13 2014 +0200 x86: always store APIC ID of CPU So far for non-Intel CPUs struct cpuinfo_x86's apicid field didn't get set, despite MCE code consuming it. Do some formatting/ordering adjustment to the touched code at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 18112f2..f1efacc 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -152,6 +152,17 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) this_cpu = &default_cpu; } +/* + * cpuid returns the value latched in the HW at reset, not the APIC ID + * register's value. For any box whose BIOS changes APIC IDs, like + * clustered APIC systems, we must use hard_smp_processor_id. + * + * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. + */ +static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) +{ + return hard_smp_processor_id() >> index_msb; +} /* Do minimum CPU detection early. Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment. @@ -216,6 +227,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) if (c->x86 >= 0x6) c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_mask = tfms & 15; + c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -339,17 +351,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) } } -/* cpuid returns the value latched in the HW at reset, not the APIC ID - * register's value. For any box whose BIOS changes APIC IDs, like - * clustered APIC systems, we must use hard_smp_processor_id. - * - * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. - */ -static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) -{ - return hard_smp_processor_id() >> index_msb; -} - /* leaf 0xb SMT level */ #define SMT_LEVEL 0 @@ -429,14 +430,12 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; int index_msb, core_bits; - cpuid(1, &eax, &ebx, &ecx, &edx); - - c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); - - if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY) - || cpu_has(c, X86_FEATURE_XTOPOLOGY)) + if (!cpu_has(c, X86_FEATURE_HT) || + cpu_has(c, X86_FEATURE_CMP_LEGACY) || + cpu_has(c, X86_FEATURE_XTOPOLOGY)) return; + cpuid(1, &eax, &ebx, &ecx, &edx); c->x86_num_siblings = (ebx & 0xff0000) >> 16; if (c->x86_num_siblings == 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 Jul 05 16:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFD-0002lB-60; Sat, 05 Jul 2014 16:55:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFB-0002kz-VH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:22 +0000 Received: from [85.158.139.211:17698] by server-9.bemta-5.messagelabs.com id EF/6E-14363-9FD28B35; Sat, 05 Jul 2014 16:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404579319!13867096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3329 invoked from network); 5 Jul 2014 16:55:20 -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; 5 Jul 2014 16:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TF9-0006N5-Dm for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TF9-0002xo-Be for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:19 +0000 Date: Sat, 05 Jul 2014 16:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: allow sparse sub-state numbering, for Bay Trail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d9dfc3803da005b6278df6f5336db4fb95da703 Author: Len Brown AuthorDate: Wed Jul 2 14:49:37 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:49:37 2014 +0200 mwait-idle: allow sparse sub-state numbering, for Bay Trail Like acpi_idle, mwait-idle compared sub-state numbers to the number of supported sub-states -- discarding sub-states numbers that were numbered >= the number of states. But some Bay Trail SOCs use sparse sub-state numbers, so we can't make such a comparison if we are going to access those states. So now we simply check that _some_ sub-states are supported for the given state, and assume that the sub-state number in our driver is valid. In practice, the driver is correct, and even if it were not, the hardware clips invalid sub-state requests to valid ones. No entries in the driver require this change, but Bay Trail will need it. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 38172e5..744a3d7 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -555,23 +555,22 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, dev->count = 1; for (cstate = 0; cpuidle_state_table[cstate].target_residency; ++cstate) { - unsigned int num_substates, hint, state, substate; + unsigned int num_substates, hint, state; struct acpi_processor_cx *cx; hint = flg2MWAIT(cpuidle_state_table[cstate].flags); state = MWAIT_HINT2CSTATE(hint) + 1; - substate = MWAIT_HINT2SUBSTATE(hint); if (state > max_cstate) { printk(PREFIX "max C-state %u reached\n", max_cstate); break; } - /* Does the state exist in CPUID.MWAIT? */ + /* Number of sub-states for this state in CPUID.MWAIT. */ num_substates = (mwait_substates >> (state * 4)) & MWAIT_SUBSTATE_MASK; - /* if sub-state in table is not enumerated by CPUID */ - if (substate >= num_substates) + /* If NO sub-states for this state in CPUID, skip it. */ + if (num_substates == 0) continue; if (dev->count >= ACPI_PROCESSOR_MAX_POWER) { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFD-0002lB-60; Sat, 05 Jul 2014 16:55:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFB-0002kz-VH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:22 +0000 Received: from [85.158.139.211:17698] by server-9.bemta-5.messagelabs.com id EF/6E-14363-9FD28B35; Sat, 05 Jul 2014 16:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404579319!13867096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3329 invoked from network); 5 Jul 2014 16:55:20 -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; 5 Jul 2014 16:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TF9-0006N5-Dm for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TF9-0002xo-Be for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:19 +0000 Date: Sat, 05 Jul 2014 16:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: allow sparse sub-state numbering, for Bay Trail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d9dfc3803da005b6278df6f5336db4fb95da703 Author: Len Brown AuthorDate: Wed Jul 2 14:49:37 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:49:37 2014 +0200 mwait-idle: allow sparse sub-state numbering, for Bay Trail Like acpi_idle, mwait-idle compared sub-state numbers to the number of supported sub-states -- discarding sub-states numbers that were numbered >= the number of states. But some Bay Trail SOCs use sparse sub-state numbers, so we can't make such a comparison if we are going to access those states. So now we simply check that _some_ sub-states are supported for the given state, and assume that the sub-state number in our driver is valid. In practice, the driver is correct, and even if it were not, the hardware clips invalid sub-state requests to valid ones. No entries in the driver require this change, but Bay Trail will need it. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 38172e5..744a3d7 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -555,23 +555,22 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, dev->count = 1; for (cstate = 0; cpuidle_state_table[cstate].target_residency; ++cstate) { - unsigned int num_substates, hint, state, substate; + unsigned int num_substates, hint, state; struct acpi_processor_cx *cx; hint = flg2MWAIT(cpuidle_state_table[cstate].flags); state = MWAIT_HINT2CSTATE(hint) + 1; - substate = MWAIT_HINT2SUBSTATE(hint); if (state > max_cstate) { printk(PREFIX "max C-state %u reached\n", max_cstate); break; } - /* Does the state exist in CPUID.MWAIT? */ + /* Number of sub-states for this state in CPUID.MWAIT. */ num_substates = (mwait_substates >> (state * 4)) & MWAIT_SUBSTATE_MASK; - /* if sub-state in table is not enumerated by CPUID */ - if (substate >= num_substates) + /* If NO sub-states for this state in CPUID, skip it. */ + if (num_substates == 0) continue; if (dev->count >= ACPI_PROCESSOR_MAX_POWER) { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFO-0002mn-8v; Sat, 05 Jul 2014 16:55:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFM-0002mV-C5 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:32 +0000 Received: from [85.158.137.68:28488] by server-15.bemta-3.messagelabs.com id 34/42-26980-30E28B35; Sat, 05 Jul 2014 16:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579329!14275357!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9884 invoked from network); 5 Jul 2014 16:55:30 -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 Jul 2014 16:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFJ-0006ND-M6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFJ-0002yB-HN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:29 +0000 Date: Sat, 05 Jul 2014 16:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: support Bay Trail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa3fe5dfe1caee97122a14a44cad85e0885a0087 Author: Len Brown AuthorDate: Wed Jul 2 14:50:17 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:50:17 2014 +0200 mwait-idle: support Bay Trail Bay Trail (BYT) is a family of Silvermont-core Atom Processor SOCs, including the Intel Atom Processor Z36xxx and Z37xxx Series. Although it shares the Silvermont core with Avoton, BYT is optimized for mobile, and thus it supports different power saving CPU idle states. Note that not all versions of Bay Trail HW support all of the states listed in the driver. Signed-off-by: Len Brown Tested-by: Aubrey Li Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 744a3d7..06f4a33 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -187,6 +187,46 @@ static const struct cpuidle_state snb_cstates[] = { {} }; +static const struct cpuidle_state byt_cstates[] = { + { + .name = "C1-BYT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-BYT", + .flags = MWAIT2flg(0x01), + .exit_latency = 15, + .target_residency = 30, + }, + { + .name = "C6N-BYT", + .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 40, + .target_residency = 275, + }, + { + .name = "C6S-BYT", + .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 140, + .target_residency = 560, + }, + { + .name = "C7-BYT", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 1200, + .target_residency = 1500, + }, + { + .name = "C7S-BYT", + .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 10000, + .target_residency = 20000, + }, + {} +}; + static const struct cpuidle_state ivb_cstates[] = { { .name = "C1-IVB", @@ -442,6 +482,11 @@ static const struct idle_cpu idle_cpu_snb = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_byt = { + .state_table = byt_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, .disable_promotion_to_c1e = 1, @@ -474,6 +519,7 @@ static struct intel_idle_id { ICPU(0x26, lincroft), ICPU(0x2a, snb), ICPU(0x2d, snb), + ICPU(0x37, byt), ICPU(0x3a, ivb), ICPU(0x3e, ivb), ICPU(0x3c, hsw), -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFO-0002mn-8v; Sat, 05 Jul 2014 16:55:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFM-0002mV-C5 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:32 +0000 Received: from [85.158.137.68:28488] by server-15.bemta-3.messagelabs.com id 34/42-26980-30E28B35; Sat, 05 Jul 2014 16:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1404579329!14275357!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9884 invoked from network); 5 Jul 2014 16:55:30 -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 Jul 2014 16:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFJ-0006ND-M6 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFJ-0002yB-HN for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:29 +0000 Date: Sat, 05 Jul 2014 16:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: support Bay Trail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa3fe5dfe1caee97122a14a44cad85e0885a0087 Author: Len Brown AuthorDate: Wed Jul 2 14:50:17 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:50:17 2014 +0200 mwait-idle: support Bay Trail Bay Trail (BYT) is a family of Silvermont-core Atom Processor SOCs, including the Intel Atom Processor Z36xxx and Z37xxx Series. Although it shares the Silvermont core with Avoton, BYT is optimized for mobile, and thus it supports different power saving CPU idle states. Note that not all versions of Bay Trail HW support all of the states listed in the driver. Signed-off-by: Len Brown Tested-by: Aubrey Li Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 744a3d7..06f4a33 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -187,6 +187,46 @@ static const struct cpuidle_state snb_cstates[] = { {} }; +static const struct cpuidle_state byt_cstates[] = { + { + .name = "C1-BYT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-BYT", + .flags = MWAIT2flg(0x01), + .exit_latency = 15, + .target_residency = 30, + }, + { + .name = "C6N-BYT", + .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 40, + .target_residency = 275, + }, + { + .name = "C6S-BYT", + .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 140, + .target_residency = 560, + }, + { + .name = "C7-BYT", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 1200, + .target_residency = 1500, + }, + { + .name = "C7S-BYT", + .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 10000, + .target_residency = 20000, + }, + {} +}; + static const struct cpuidle_state ivb_cstates[] = { { .name = "C1-IVB", @@ -442,6 +482,11 @@ static const struct idle_cpu idle_cpu_snb = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_byt = { + .state_table = byt_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, .disable_promotion_to_c1e = 1, @@ -474,6 +519,7 @@ static struct intel_idle_id { ICPU(0x26, lincroft), ICPU(0x2a, snb), ICPU(0x2d, snb), + ICPU(0x37, byt), ICPU(0x3a, ivb), ICPU(0x3e, ivb), ICPU(0x3c, hsw), -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFY-0002oX-Bd; Sat, 05 Jul 2014 16:55:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFW-0002o7-DJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:42 +0000 Received: from [85.158.137.68:65186] by server-17.bemta-3.messagelabs.com id FA/D8-05521-D0E28B35; Sat, 05 Jul 2014 16:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404579340!14166913!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28269 invoked from network); 5 Jul 2014 16:55:41 -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; 5 Jul 2014 16:55:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFT-0006NJ-QS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFT-0002ya-PS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:39 +0000 Date: Sat, 05 Jul 2014 16:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: add CPU model 54 (Atom N2000 series) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd5bcaf7b67568744cd003ac9e07e863780bda08 Author: Jan Kiszka AuthorDate: Wed Jul 2 14:50:46 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:50:46 2014 +0200 mwait-idle: add CPU model 54 (Atom N2000 series) Add CPU ID for Atom N2600/N2800 processors. Datasheets indicate support for this, detailed information about potential quirks or limitations are missing, though. So we just reuse the definition for the previous ATOM series. Tests on N2800 systems showed that this addition is fine an can reduce power consumption by about 0.25 W (personally confirmed on Intel DN2800MT). Signed-off-by: Jan Kiszka Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 06f4a33..3a4b970 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -519,6 +519,7 @@ static struct intel_idle_id { ICPU(0x26, lincroft), ICPU(0x2a, snb), ICPU(0x2d, snb), + ICPU(0x36, atom), ICPU(0x37, byt), ICPU(0x3a, ivb), ICPU(0x3e, ivb), -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFY-0002oX-Bd; Sat, 05 Jul 2014 16:55:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFW-0002o7-DJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:42 +0000 Received: from [85.158.137.68:65186] by server-17.bemta-3.messagelabs.com id FA/D8-05521-D0E28B35; Sat, 05 Jul 2014 16:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1404579340!14166913!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28269 invoked from network); 5 Jul 2014 16:55:41 -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; 5 Jul 2014 16:55:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFT-0006NJ-QS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFT-0002ya-PS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:39 +0000 Date: Sat, 05 Jul 2014 16:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: add CPU model 54 (Atom N2000 series) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd5bcaf7b67568744cd003ac9e07e863780bda08 Author: Jan Kiszka AuthorDate: Wed Jul 2 14:50:46 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:50:46 2014 +0200 mwait-idle: add CPU model 54 (Atom N2000 series) Add CPU ID for Atom N2600/N2800 processors. Datasheets indicate support for this, detailed information about potential quirks or limitations are missing, though. So we just reuse the definition for the previous ATOM series. Tests on N2800 systems showed that this addition is fine an can reduce power consumption by about 0.25 W (personally confirmed on Intel DN2800MT). Signed-off-by: Jan Kiszka Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 06f4a33..3a4b970 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -519,6 +519,7 @@ static struct intel_idle_id { ICPU(0x26, lincroft), ICPU(0x2a, snb), ICPU(0x2d, snb), + ICPU(0x36, atom), ICPU(0x37, byt), ICPU(0x3a, ivb), ICPU(0x3e, ivb), -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFh-0002pm-PS; Sat, 05 Jul 2014 16:55:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFh-0002pb-6e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:53 +0000 Received: from [85.158.137.68:28936] by server-14.bemta-3.messagelabs.com id CF/A0-19846-81E28B35; Sat, 05 Jul 2014 16:55:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579350!14223249!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26796 invoked from network); 5 Jul 2014 16:55:51 -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; 5 Jul 2014 16:55:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFd-0006NP-VO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFd-0002yw-Tr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:49 +0000 Date: Sat, 05 Jul 2014 16:55:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: fine-tune IVT residency targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 513fc61e5d7f770e35fad502c6c8f577cd9b56f2 Author: Len Brown AuthorDate: Wed Jul 2 14:51:18 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:51:18 2014 +0200 mwait-idle: fine-tune IVT residency targets Ivy Town processors have slightly different properties than Ivy Bridge processors, particuarly as socket count grows. Here we add dedicated tables covering 1-2 socket, 3-4 socket, and > 4 socket IVT configurations. This reduces the frequency of deep transitions on those systems, which can impact throughput. Signed-off-by: Len Brown Socket count determination needs to be done differently for us: The relevant code runs in a pre-SMP initcall, and hence can't use cpu_to_socket() (as only the boot CPU's cpu_data[].phys_proc_id got set up by that time). As a replacement the patch introduces apicid_to_socket(), thus estimating the socket count based on the boot CPU's internal topology information (if all CPUs in a system are the same, wich ought to be the common case, this estimate will be precise). Note that apicid_to_socket() handles Intel topology determination only for now, as the mwait-idle driver currently only supports Intel CPUs. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 44 +++++++++++++- xen/arch/x86/cpu/mwait-idle.c | 125 ++++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/processor.h | 2 + 3 files changed, 169 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f1efacc..52d3169 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -152,6 +152,11 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) this_cpu = &default_cpu; } +static inline u32 _phys_pkg_id(u32 cpuid_apic, int index_msb) +{ + return cpuid_apic >> index_msb; +} + /* * cpuid returns the value latched in the HW at reset, not the APIC ID * register's value. For any box whose BIOS changes APIC IDs, like @@ -161,7 +166,7 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) */ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) { - return hard_smp_processor_id() >> index_msb; + return _phys_pkg_id(hard_smp_processor_id(), index_msb); } /* Do minimum CPU detection early. @@ -471,6 +476,43 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) } #endif +unsigned int __init apicid_to_socket(unsigned int apicid) +{ + unsigned int dummy; + + if (boot_cpu_has(X86_FEATURE_XTOPOLOGY)) { + unsigned int eax, ecx, sub_index = 1, core_plus_mask_width; + + cpuid_count(0xb, SMT_LEVEL, &eax, &dummy, &dummy, &dummy); + core_plus_mask_width = BITS_SHIFT_NEXT_LEVEL(eax); + do { + cpuid_count(0xb, sub_index, &eax, &dummy, &ecx, + &dummy); + + if (LEAFB_SUBTYPE(ecx) == CORE_TYPE) { + core_plus_mask_width = + BITS_SHIFT_NEXT_LEVEL(eax); + break; + } + + sub_index++; + } while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE); + + return _phys_pkg_id(apicid, core_plus_mask_width); + } + + if (boot_cpu_has(X86_FEATURE_HT) && + !boot_cpu_has(X86_FEATURE_CMP_LEGACY)) { + unsigned int num_siblings = (cpuid_ebx(1) & 0xff0000) >> 16; + + if (num_siblings) + return _phys_pkg_id(apicid, + get_count_order(num_siblings)); + } + + return apicid; +} + void __cpuinit print_cpu_info(unsigned int cpu) { const struct cpuinfo_x86 *c = cpu_data + cpu; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 3a4b970..c2c8889 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -261,6 +261,90 @@ static const struct cpuidle_state ivb_cstates[] = { {} }; +static const struct cpuidle_state ivt_cstates[] = { + { + .name = "C1-IVT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 80, + }, + { + .name = "C3-IVT", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 156, + }, + { + .name = "C6-IVT", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 82, + .target_residency = 300, + }, + {} +}; + +static const struct cpuidle_state ivt_cstates_4s[] = { + { + .name = "C1-IVT-4S", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT-4S", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 250, + }, + { + .name = "C3-IVT-4S", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 300, + }, + { + .name = "C6-IVT-4S", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 84, + .target_residency = 400, + }, + {} +}; + +static const struct cpuidle_state ivt_cstates_8s[] = { + { + .name = "C1-IVT-8S", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT-8S", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 500, + }, + { + .name = "C3-IVT-8S", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 600, + }, + { + .name = "C6-IVT-8S", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 88, + .target_residency = 700, + }, + {} +}; + static const struct cpuidle_state hsw_cstates[] = { { .name = "C1-HSW", @@ -492,6 +576,11 @@ static const struct idle_cpu idle_cpu_ivb = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_ivt = { + .state_table = ivt_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_hsw = { .state_table = hsw_cstates, .disable_promotion_to_c1e = 1, @@ -522,7 +611,7 @@ static struct intel_idle_id { ICPU(0x36, atom), ICPU(0x37, byt), ICPU(0x3a, ivb), - ICPU(0x3e, ivb), + ICPU(0x3e, ivt), ICPU(0x3c, hsw), ICPU(0x3f, hsw), ICPU(0x45, hsw), @@ -531,6 +620,37 @@ static struct intel_idle_id { {} }; +/* + * mwait_idle_state_table_update() + * + * Update the default state_table for this CPU-id + * + * Currently used to access tuned IVT multi-socket targets + * Assumption: num_sockets == (max_package_num + 1) + */ +static void __init mwait_idle_state_table_update(void) +{ + /* IVT uses a different table for 1-2, 3-4, and > 4 sockets */ + if (boot_cpu_data.x86_model == 0x3e) { /* IVT */ + unsigned int cpu, max_apicid = boot_cpu_physical_apicid; + + for_each_present_cpu(cpu) + if (max_apicid < x86_cpu_to_apicid[cpu]) + max_apicid = x86_cpu_to_apicid[cpu]; + switch (apicid_to_socket(max_apicid)) { + case 0: case 1: + /* 1 and 2 socket systems use default ivt_cstates */ + break; + case 2: case 3: + cpuidle_state_table = ivt_cstates_4s; + break; + default: + cpuidle_state_table = ivt_cstates_8s; + break; + } + } +} + static int __init mwait_idle_probe(void) { unsigned int eax, ebx, ecx; @@ -576,6 +696,9 @@ static int __init mwait_idle_probe(void) pr_debug(PREFIX "lapic_timer_reliable_states %#x\n", lapic_timer_reliable_states); + + mwait_idle_state_table_update(); + return 0; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 46107a6..bcba0ed 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -220,6 +220,8 @@ static always_inline void detect_ht(struct cpuinfo_x86 *c) {} #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id) +unsigned int apicid_to_socket(unsigned int); + /* * Generic CPUID function * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:55:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:55: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 1X3TFh-0002pm-PS; Sat, 05 Jul 2014 16:55:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFh-0002pb-6e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:53 +0000 Received: from [85.158.137.68:28936] by server-14.bemta-3.messagelabs.com id CF/A0-19846-81E28B35; Sat, 05 Jul 2014 16:55:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579350!14223249!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26796 invoked from network); 5 Jul 2014 16:55:51 -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; 5 Jul 2014 16:55:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFd-0006NP-VO for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFd-0002yw-Tr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:55:49 +0000 Date: Sat, 05 Jul 2014 16:55:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: fine-tune IVT residency targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 513fc61e5d7f770e35fad502c6c8f577cd9b56f2 Author: Len Brown AuthorDate: Wed Jul 2 14:51:18 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:51:18 2014 +0200 mwait-idle: fine-tune IVT residency targets Ivy Town processors have slightly different properties than Ivy Bridge processors, particuarly as socket count grows. Here we add dedicated tables covering 1-2 socket, 3-4 socket, and > 4 socket IVT configurations. This reduces the frequency of deep transitions on those systems, which can impact throughput. Signed-off-by: Len Brown Socket count determination needs to be done differently for us: The relevant code runs in a pre-SMP initcall, and hence can't use cpu_to_socket() (as only the boot CPU's cpu_data[].phys_proc_id got set up by that time). As a replacement the patch introduces apicid_to_socket(), thus estimating the socket count based on the boot CPU's internal topology information (if all CPUs in a system are the same, wich ought to be the common case, this estimate will be precise). Note that apicid_to_socket() handles Intel topology determination only for now, as the mwait-idle driver currently only supports Intel CPUs. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 44 +++++++++++++- xen/arch/x86/cpu/mwait-idle.c | 125 ++++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/processor.h | 2 + 3 files changed, 169 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f1efacc..52d3169 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -152,6 +152,11 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) this_cpu = &default_cpu; } +static inline u32 _phys_pkg_id(u32 cpuid_apic, int index_msb) +{ + return cpuid_apic >> index_msb; +} + /* * cpuid returns the value latched in the HW at reset, not the APIC ID * register's value. For any box whose BIOS changes APIC IDs, like @@ -161,7 +166,7 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) */ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) { - return hard_smp_processor_id() >> index_msb; + return _phys_pkg_id(hard_smp_processor_id(), index_msb); } /* Do minimum CPU detection early. @@ -471,6 +476,43 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) } #endif +unsigned int __init apicid_to_socket(unsigned int apicid) +{ + unsigned int dummy; + + if (boot_cpu_has(X86_FEATURE_XTOPOLOGY)) { + unsigned int eax, ecx, sub_index = 1, core_plus_mask_width; + + cpuid_count(0xb, SMT_LEVEL, &eax, &dummy, &dummy, &dummy); + core_plus_mask_width = BITS_SHIFT_NEXT_LEVEL(eax); + do { + cpuid_count(0xb, sub_index, &eax, &dummy, &ecx, + &dummy); + + if (LEAFB_SUBTYPE(ecx) == CORE_TYPE) { + core_plus_mask_width = + BITS_SHIFT_NEXT_LEVEL(eax); + break; + } + + sub_index++; + } while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE); + + return _phys_pkg_id(apicid, core_plus_mask_width); + } + + if (boot_cpu_has(X86_FEATURE_HT) && + !boot_cpu_has(X86_FEATURE_CMP_LEGACY)) { + unsigned int num_siblings = (cpuid_ebx(1) & 0xff0000) >> 16; + + if (num_siblings) + return _phys_pkg_id(apicid, + get_count_order(num_siblings)); + } + + return apicid; +} + void __cpuinit print_cpu_info(unsigned int cpu) { const struct cpuinfo_x86 *c = cpu_data + cpu; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 3a4b970..c2c8889 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -261,6 +261,90 @@ static const struct cpuidle_state ivb_cstates[] = { {} }; +static const struct cpuidle_state ivt_cstates[] = { + { + .name = "C1-IVT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 80, + }, + { + .name = "C3-IVT", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 156, + }, + { + .name = "C6-IVT", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 82, + .target_residency = 300, + }, + {} +}; + +static const struct cpuidle_state ivt_cstates_4s[] = { + { + .name = "C1-IVT-4S", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT-4S", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 250, + }, + { + .name = "C3-IVT-4S", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 300, + }, + { + .name = "C6-IVT-4S", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 84, + .target_residency = 400, + }, + {} +}; + +static const struct cpuidle_state ivt_cstates_8s[] = { + { + .name = "C1-IVT-8S", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C1E-IVT-8S", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 500, + }, + { + .name = "C3-IVT-8S", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 59, + .target_residency = 600, + }, + { + .name = "C6-IVT-8S", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 88, + .target_residency = 700, + }, + {} +}; + static const struct cpuidle_state hsw_cstates[] = { { .name = "C1-HSW", @@ -492,6 +576,11 @@ static const struct idle_cpu idle_cpu_ivb = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_ivt = { + .state_table = ivt_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_hsw = { .state_table = hsw_cstates, .disable_promotion_to_c1e = 1, @@ -522,7 +611,7 @@ static struct intel_idle_id { ICPU(0x36, atom), ICPU(0x37, byt), ICPU(0x3a, ivb), - ICPU(0x3e, ivb), + ICPU(0x3e, ivt), ICPU(0x3c, hsw), ICPU(0x3f, hsw), ICPU(0x45, hsw), @@ -531,6 +620,37 @@ static struct intel_idle_id { {} }; +/* + * mwait_idle_state_table_update() + * + * Update the default state_table for this CPU-id + * + * Currently used to access tuned IVT multi-socket targets + * Assumption: num_sockets == (max_package_num + 1) + */ +static void __init mwait_idle_state_table_update(void) +{ + /* IVT uses a different table for 1-2, 3-4, and > 4 sockets */ + if (boot_cpu_data.x86_model == 0x3e) { /* IVT */ + unsigned int cpu, max_apicid = boot_cpu_physical_apicid; + + for_each_present_cpu(cpu) + if (max_apicid < x86_cpu_to_apicid[cpu]) + max_apicid = x86_cpu_to_apicid[cpu]; + switch (apicid_to_socket(max_apicid)) { + case 0: case 1: + /* 1 and 2 socket systems use default ivt_cstates */ + break; + case 2: case 3: + cpuidle_state_table = ivt_cstates_4s; + break; + default: + cpuidle_state_table = ivt_cstates_8s; + break; + } + } +} + static int __init mwait_idle_probe(void) { unsigned int eax, ebx, ecx; @@ -576,6 +696,9 @@ static int __init mwait_idle_probe(void) pr_debug(PREFIX "lapic_timer_reliable_states %#x\n", lapic_timer_reliable_states); + + mwait_idle_state_table_update(); + return 0; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 46107a6..bcba0ed 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -220,6 +220,8 @@ static always_inline void detect_ht(struct cpuinfo_x86 *c) {} #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id) +unsigned int apicid_to_socket(unsigned int); + /* * Generic CPUID function * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:56:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TFr-0002rh-Tw; Sat, 05 Jul 2014 16:56:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFq-0002rK-PZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:02 +0000 Received: from [85.158.143.35:7387] by server-3.bemta-4.messagelabs.com id C3/7F-16194-22E28B35; Sat, 05 Jul 2014 16:56:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404579360!16034487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29950 invoked from network); 5 Jul 2014 16:56:01 -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; 5 Jul 2014 16:56:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFo-0006NY-9U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFo-0002zJ-2a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:00 +0000 Date: Sat, 05 Jul 2014 16:56:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop pointless CONFIG_X86_HT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5bf6a48df37dd284eb83d87f83444eee3b149e Author: Jan Beulich AuthorDate: Wed Jul 2 14:52:12 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:52:12 2014 +0200 x86: drop pointless CONFIG_X86_HT Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 2 -- xen/arch/x86/cpu/common.c | 7 +------ xen/include/asm-x86/config.h | 1 - xen/include/asm-x86/processor.h | 4 ---- 4 files changed, 1 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 5e78f87..566cdac 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -385,7 +385,6 @@ static void check_syscfg_dram_mod_en(void) static void __devinit amd_get_topology(struct cpuinfo_x86 *c) { -#ifdef CONFIG_X86_HT int cpu; unsigned bits; @@ -423,7 +422,6 @@ static void __devinit amd_get_topology(struct cpuinfo_x86 *c) "Core", cpu_has(c, X86_FEATURE_TOPOEXT) ? c->compute_unit_id : c->cpu_core_id); -#endif } static void __devinit init_amd(struct cpuinfo_x86 *c) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 52d3169..0741696 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -233,6 +233,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_mask = tfms & 15; c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); + c->phys_proc_id = c->apicid; if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -257,10 +258,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) } early_intel_workaround(c); - -#ifdef CONFIG_X86_HT - c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; -#endif } /* @@ -429,7 +426,6 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) } } -#ifdef CONFIG_X86_HT void __cpuinit detect_ht(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx; @@ -474,7 +470,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) c->cpu_core_id); } } -#endif unsigned int __init apicid_to_socket(unsigned int apicid) { diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 02ab1fc..210ff57 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -17,7 +17,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG #define CONFIG_X86 1 -#define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_X86_LOCAL_APIC 1 #define CONFIG_X86_GOOD_APIC 1 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index bcba0ed..a156e01 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -211,11 +211,7 @@ extern void dodgy_tsc(void); extern void detect_extended_topology(struct cpuinfo_x86 *c); -#ifdef CONFIG_X86_HT extern void detect_ht(struct cpuinfo_x86 *c); -#else -static always_inline void detect_ht(struct cpuinfo_x86 *c) {} -#endif #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:56:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TFr-0002rh-Tw; Sat, 05 Jul 2014 16:56:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFq-0002rK-PZ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:02 +0000 Received: from [85.158.143.35:7387] by server-3.bemta-4.messagelabs.com id C3/7F-16194-22E28B35; Sat, 05 Jul 2014 16:56:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404579360!16034487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29950 invoked from network); 5 Jul 2014 16:56:01 -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; 5 Jul 2014 16:56:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFo-0006NY-9U for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFo-0002zJ-2a for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:00 +0000 Date: Sat, 05 Jul 2014 16:56:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop pointless CONFIG_X86_HT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5bf6a48df37dd284eb83d87f83444eee3b149e Author: Jan Beulich AuthorDate: Wed Jul 2 14:52:12 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 2 14:52:12 2014 +0200 x86: drop pointless CONFIG_X86_HT Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 2 -- xen/arch/x86/cpu/common.c | 7 +------ xen/include/asm-x86/config.h | 1 - xen/include/asm-x86/processor.h | 4 ---- 4 files changed, 1 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 5e78f87..566cdac 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -385,7 +385,6 @@ static void check_syscfg_dram_mod_en(void) static void __devinit amd_get_topology(struct cpuinfo_x86 *c) { -#ifdef CONFIG_X86_HT int cpu; unsigned bits; @@ -423,7 +422,6 @@ static void __devinit amd_get_topology(struct cpuinfo_x86 *c) "Core", cpu_has(c, X86_FEATURE_TOPOEXT) ? c->compute_unit_id : c->cpu_core_id); -#endif } static void __devinit init_amd(struct cpuinfo_x86 *c) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 52d3169..0741696 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -233,6 +233,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_mask = tfms & 15; c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); + c->phys_proc_id = c->apicid; if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -257,10 +258,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) } early_intel_workaround(c); - -#ifdef CONFIG_X86_HT - c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; -#endif } /* @@ -429,7 +426,6 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) } } -#ifdef CONFIG_X86_HT void __cpuinit detect_ht(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx; @@ -474,7 +470,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) c->cpu_core_id); } } -#endif unsigned int __init apicid_to_socket(unsigned int apicid) { diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 02ab1fc..210ff57 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -17,7 +17,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG #define CONFIG_X86 1 -#define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_X86_LOCAL_APIC 1 #define CONFIG_X86_GOOD_APIC 1 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index bcba0ed..a156e01 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -211,11 +211,7 @@ extern void dodgy_tsc(void); extern void detect_extended_topology(struct cpuinfo_x86 *c); -#ifdef CONFIG_X86_HT extern void detect_ht(struct cpuinfo_x86 *c); -#else -static always_inline void detect_ht(struct cpuinfo_x86 *c) {} -#endif #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:56:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TG2-0002tO-0T; Sat, 05 Jul 2014 16:56:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TG1-0002tB-5s for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:13 +0000 Content-Length: 1951 Received: from [193.109.254.147:51133] by server-3.bemta-14.messagelabs.com id DC/B1-13460-C2E28B35; Sat, 05 Jul 2014 16:56:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1404579370!12342155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23149 invoked from network); 5 Jul 2014 16:56:11 -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; 5 Jul 2014 16:56:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFy-0006O7-Fv for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFy-00030O-D8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:10 +0000 Date: Sat, 05 Jul 2014 16:56:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: make xl the default and remove xm 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: multipart/mixed; boundary="===============4709927401071071682==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4709927401071071682== Content-Length: 1545 Content-Transfer-Encoding: quoted-printable commit 9ba60d01f2fc4279c58b5336f939dea31611c10d Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:43 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:23:08 2014 +0100 tools/xendomains: make xl the default and remove xm usage xm is gone so make xl the default and remove xm stuff. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/hotplug/Linux/init.d/xendomains | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index 59f1e3d..f68fd2b 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -29,13 +29,12 @@ . /etc/xen/scripts/hotplugpath.sh -CMD=3D${SBINDIR}/xm -HEADCOMP=3D"LinuxGuestRecord" +CMD=3D${SBINDIR}/xl +HEADCOMP=3D"Xen saved domain" $CMD list &> /dev/null if test $=3F -ne 0 then - CMD=3D${SBINDIR}/xl - HEADCOMP=3D"Xen saved domain" + exit $=3F fi $CMD list &> /dev/null -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4709927401071071682== 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 --===============4709927401071071682==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TG2-0002tO-0T; Sat, 05 Jul 2014 16:56:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TG1-0002tB-5s for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:13 +0000 Content-Length: 1951 Received: from [193.109.254.147:51133] by server-3.bemta-14.messagelabs.com id DC/B1-13460-C2E28B35; Sat, 05 Jul 2014 16:56:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1404579370!12342155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23149 invoked from network); 5 Jul 2014 16:56:11 -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; 5 Jul 2014 16:56:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TFy-0006O7-Fv for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TFy-00030O-D8 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:10 +0000 Date: Sat, 05 Jul 2014 16:56:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: make xl the default and remove xm 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: multipart/mixed; boundary="===============4709927401071071682==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4709927401071071682== Content-Length: 1545 Content-Transfer-Encoding: quoted-printable commit 9ba60d01f2fc4279c58b5336f939dea31611c10d Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:43 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:23:08 2014 +0100 tools/xendomains: make xl the default and remove xm usage xm is gone so make xl the default and remove xm stuff. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/hotplug/Linux/init.d/xendomains | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index 59f1e3d..f68fd2b 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -29,13 +29,12 @@ . /etc/xen/scripts/hotplugpath.sh -CMD=3D${SBINDIR}/xm -HEADCOMP=3D"LinuxGuestRecord" +CMD=3D${SBINDIR}/xl +HEADCOMP=3D"Xen saved domain" $CMD list &> /dev/null if test $=3F -ne 0 then - CMD=3D${SBINDIR}/xl - HEADCOMP=3D"Xen saved domain" + exit $=3F fi $CMD list &> /dev/null -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4709927401071071682== 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 --===============4709927401071071682==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGE-0002vF-4J; Sat, 05 Jul 2014 16:56:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGD-0002v6-93 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:25 +0000 Content-Length: 6822 Received: from [193.109.254.147:37640] by server-3.bemta-14.messagelabs.com id 0B/C1-13460-83E28B35; Sat, 05 Jul 2014 16:56:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404579380!15688828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12600 invoked from network); 5 Jul 2014 16:56: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; 5 Jul 2014 16:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TG8-0006OD-Ob for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TG8-00030n-MS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:20 +0000 Date: Sat, 05 Jul 2014 16:56:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: do space cleanups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5868876025490156669==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5868876025490156669== Content-Length: 6616 Content-Transfer-Encoding: quoted-printable commit 4a8374be4775c0a4be18e9276e062e00027e5eb0 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:44 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:23:08 2014 +0100 tools/xendomains: do space cleanups This has no functional changes. This is just to prepare the file to be moved, so you won't blind your eyes or get git am to complain. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/hotplug/Linux/init.d/xendomains | 62 ++++++++++++++++---------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index f68fd2b..cad92da 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -23,7 +23,7 @@ # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop secondary xen domains -# Description: Start / stop domains automatically when domain 0 +# Description: Start / stop domains automatically when domain 0 # boots / shuts down. ### END INIT INFO @@ -43,7 +43,7 @@ then exit 0; fi -# Correct exit code would probably be 5, but it's enough +# Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain if ! [ -e /proc/xen/privcmd ]; then exit 0 @@ -73,7 +73,7 @@ test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if test -e /etc/rc.status; then # SUSE rc script library . /etc/rc.status -else +else _cmd=3D$1 declare -a _SMSG if test "${_cmd}" =3D "status"; then @@ -96,7 +96,7 @@ else fi } elif test -e /lib/lsb/init-functions; then - # LSB + # LSB . /lib/lsb/init-functions if alias log_success_msg >/dev/null 2>/dev/null; then echo_rc() @@ -113,7 +113,7 @@ else fi } fi - else + else # emulate it echo_rc() { @@ -123,17 +123,17 @@ else rc_reset() { _RC_RV=3D0; } rc_failed() { - if test -z "$1"; then + if test -z "$1"; then _RC_RV=3D1; - elif test "$1" !=3D "0"; then - _RC_RV=3D$1; - fi + elif test "$1" !=3D "0"; then + _RC_RV=3D$1; + fi return ${_RC_RV} } rc_check() { return rc_failed $=3F - } + } rc_status() { rc_failed $=3F @@ -145,7 +145,7 @@ else return ${_RC_RV} } rc_exit() { exit ${_RC_RV}; } - rc_active() + rc_active() { if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi @@ -192,13 +192,13 @@ rdnames() { NAMES=3D if ! contains_something "$XENDOMAINS_AUTO" - then + then return fi for dom in $XENDOMAINS_AUTO/*; do rdname $dom - if test -z $NAMES; then - NAMES=3D$NM; + if test -z $NAMES; then + NAMES=3D$NM; else NAMES=3D"$NAMES|$NM" fi @@ -231,7 +231,7 @@ is_running() while read LN; do parseln "$LN" || continue if test $id =3D 0; then continue; fi - case $name in + case $name in ($NM) RC=3D0 ;; @@ -240,11 +240,11 @@ is_running() return $RC } -start() +start() { - if [ -f $LOCKFILE ]; then + if [ -f $LOCKFILE ]; then echo -e "xendomains already running (lockfile exists)" - return; + return; fi saved_domains=3D" " @@ -284,10 +284,10 @@ start() # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere # Create all domains with config files in XENDOMAINS_AUTO. - # TODO: We should record which domain name belongs + # TODO: We should record which domain name belongs # so we have the option to selectively shut down / migrate later # If a domain statefile from $XENDOMAINS_SAVE matches a domain name - # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't + # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't # restore correctly it requires administrative attention. for dom in $XENDOMAINS_AUTO/*; do echo -n " ${dom##*/}" @@ -348,14 +348,14 @@ watchdog_xencmd() read PSF PSUID PSPID PSPPID < <(echo "$PSAX") # kill $CMD $1 kill $PSPID >/dev/null 2>&1 - + echo -e . } stop() { exec 3>&2 2> /dev/null - + # Collect list of domains to shut down if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then rdnames @@ -379,7 +379,7 @@ stop() esac " fi - # XENDOMAINS_SYSRQ chould be something like just "s" + # XENDOMAINS_SYSRQ chould be something like just "s" # or "s e i u" or even "s e s i u o" # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so if test -n "$XENDOMAINS_SYSRQ"; then @@ -412,7 +412,7 @@ stop() kill $WDOG_PID >/dev/null 2>&1 else kill $WDOG_PID >/dev/null 2>&1 - + echo -e . usleep 1000 continue @@ -471,7 +471,7 @@ stop() # Unconditionally delete lock file rm -f $LOCKFILE - + exec 2>&3 } @@ -481,7 +481,7 @@ check_domain_up() while read LN; do parseln "$LN" || continue if test $id =3D 0; then continue; fi - case $name in + case $name in ($1) return 0 ;; @@ -500,9 +500,9 @@ check_all_auto_domains_up() for nm in $XENDOMAINS_AUTO/*; do rdname $nm found=3D0 - if check_domain_up "$NM"; then + if check_domain_up "$NM"; then echo -n " $name" - else + else missing=3D"$missing $NM" fi done @@ -515,7 +515,7 @@ check_all_auto_domains_up() check_all_saved_domains_up() { - if ! contains_something "$XENDOMAINS_SAVE" + if ! contains_something "$XENDOMAINS_SAVE" then return 0 fi @@ -562,8 +562,8 @@ case "$1" in ;; status) - echo -n "Checking for xendomains:" - if test ! -f $LOCKFILE; then + echo -n "Checking for xendomains:" + if test ! -f $LOCKFILE; then rc_failed 3 else check_all_auto_domains_up -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5868876025490156669== 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 --===============5868876025490156669==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGE-0002vF-4J; Sat, 05 Jul 2014 16:56:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGD-0002v6-93 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:25 +0000 Content-Length: 6822 Received: from [193.109.254.147:37640] by server-3.bemta-14.messagelabs.com id 0B/C1-13460-83E28B35; Sat, 05 Jul 2014 16:56:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404579380!15688828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12600 invoked from network); 5 Jul 2014 16:56: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; 5 Jul 2014 16:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TG8-0006OD-Ob for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TG8-00030n-MS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:20 +0000 Date: Sat, 05 Jul 2014 16:56:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: do space cleanups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5868876025490156669==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5868876025490156669== Content-Length: 6616 Content-Transfer-Encoding: quoted-printable commit 4a8374be4775c0a4be18e9276e062e00027e5eb0 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:44 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:23:08 2014 +0100 tools/xendomains: do space cleanups This has no functional changes. This is just to prepare the file to be moved, so you won't blind your eyes or get git am to complain. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/hotplug/Linux/init.d/xendomains | 62 ++++++++++++++++---------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index f68fd2b..cad92da 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -23,7 +23,7 @@ # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop secondary xen domains -# Description: Start / stop domains automatically when domain 0 +# Description: Start / stop domains automatically when domain 0 # boots / shuts down. ### END INIT INFO @@ -43,7 +43,7 @@ then exit 0; fi -# Correct exit code would probably be 5, but it's enough +# Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain if ! [ -e /proc/xen/privcmd ]; then exit 0 @@ -73,7 +73,7 @@ test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if test -e /etc/rc.status; then # SUSE rc script library . /etc/rc.status -else +else _cmd=3D$1 declare -a _SMSG if test "${_cmd}" =3D "status"; then @@ -96,7 +96,7 @@ else fi } elif test -e /lib/lsb/init-functions; then - # LSB + # LSB . /lib/lsb/init-functions if alias log_success_msg >/dev/null 2>/dev/null; then echo_rc() @@ -113,7 +113,7 @@ else fi } fi - else + else # emulate it echo_rc() { @@ -123,17 +123,17 @@ else rc_reset() { _RC_RV=3D0; } rc_failed() { - if test -z "$1"; then + if test -z "$1"; then _RC_RV=3D1; - elif test "$1" !=3D "0"; then - _RC_RV=3D$1; - fi + elif test "$1" !=3D "0"; then + _RC_RV=3D$1; + fi return ${_RC_RV} } rc_check() { return rc_failed $=3F - } + } rc_status() { rc_failed $=3F @@ -145,7 +145,7 @@ else return ${_RC_RV} } rc_exit() { exit ${_RC_RV}; } - rc_active() + rc_active() { if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi @@ -192,13 +192,13 @@ rdnames() { NAMES=3D if ! contains_something "$XENDOMAINS_AUTO" - then + then return fi for dom in $XENDOMAINS_AUTO/*; do rdname $dom - if test -z $NAMES; then - NAMES=3D$NM; + if test -z $NAMES; then + NAMES=3D$NM; else NAMES=3D"$NAMES|$NM" fi @@ -231,7 +231,7 @@ is_running() while read LN; do parseln "$LN" || continue if test $id =3D 0; then continue; fi - case $name in + case $name in ($NM) RC=3D0 ;; @@ -240,11 +240,11 @@ is_running() return $RC } -start() +start() { - if [ -f $LOCKFILE ]; then + if [ -f $LOCKFILE ]; then echo -e "xendomains already running (lockfile exists)" - return; + return; fi saved_domains=3D" " @@ -284,10 +284,10 @@ start() # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere # Create all domains with config files in XENDOMAINS_AUTO. - # TODO: We should record which domain name belongs + # TODO: We should record which domain name belongs # so we have the option to selectively shut down / migrate later # If a domain statefile from $XENDOMAINS_SAVE matches a domain name - # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't + # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't # restore correctly it requires administrative attention. for dom in $XENDOMAINS_AUTO/*; do echo -n " ${dom##*/}" @@ -348,14 +348,14 @@ watchdog_xencmd() read PSF PSUID PSPID PSPPID < <(echo "$PSAX") # kill $CMD $1 kill $PSPID >/dev/null 2>&1 - + echo -e . } stop() { exec 3>&2 2> /dev/null - + # Collect list of domains to shut down if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then rdnames @@ -379,7 +379,7 @@ stop() esac " fi - # XENDOMAINS_SYSRQ chould be something like just "s" + # XENDOMAINS_SYSRQ chould be something like just "s" # or "s e i u" or even "s e s i u o" # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so if test -n "$XENDOMAINS_SYSRQ"; then @@ -412,7 +412,7 @@ stop() kill $WDOG_PID >/dev/null 2>&1 else kill $WDOG_PID >/dev/null 2>&1 - + echo -e . usleep 1000 continue @@ -471,7 +471,7 @@ stop() # Unconditionally delete lock file rm -f $LOCKFILE - + exec 2>&3 } @@ -481,7 +481,7 @@ check_domain_up() while read LN; do parseln "$LN" || continue if test $id =3D 0; then continue; fi - case $name in + case $name in ($1) return 0 ;; @@ -500,9 +500,9 @@ check_all_auto_domains_up() for nm in $XENDOMAINS_AUTO/*; do rdname $nm found=3D0 - if check_domain_up "$NM"; then + if check_domain_up "$NM"; then echo -n " $name" - else + else missing=3D"$missing $NM" fi done @@ -515,7 +515,7 @@ check_all_auto_domains_up() check_all_saved_domains_up() { - if ! contains_something "$XENDOMAINS_SAVE" + if ! contains_something "$XENDOMAINS_SAVE" then return 0 fi @@ -562,8 +562,8 @@ case "$1" in ;; status) - echo -n "Checking for xendomains:" - if test ! -f $LOCKFILE; then + echo -n "Checking for xendomains:" + if test ! -f $LOCKFILE; then rc_failed 3 else check_all_auto_domains_up -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5868876025490156669== 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 --===============5868876025490156669==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGO-0002wl-7d; Sat, 05 Jul 2014 16:56:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGN-0002wb-6Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:35 +0000 Content-Length: 32751 Received: from [85.158.139.211:27337] by server-6.bemta-5.messagelabs.com id CF/83-25531-24E28B35; Sat, 05 Jul 2014 16:56:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404579391!8450031!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1241 invoked from network); 5 Jul 2014 16:56:32 -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; 5 Jul 2014 16:56:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGI-0006OL-UU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGI-00031C-S1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:30 +0000 Date: Sat, 05 Jul 2014 16:56:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: move to libexec and use a smaller init helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4814925661014454301==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4814925661014454301== Content-Length: 33542 Content-Transfer-Encoding: quoted-printable commit d8bad9df2544291a0fdc8e4d826b16f9f5394462 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:45 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:29 2014 +0100 tools/xendomains: move to libexec and use a smaller init helper The xendomains script can be reused with systemd systems as it does not control services or sockets per se, but does a one shot scrape of domUs it needs start bring up, stop, reload so we're going to reuse it. This moves the core of the script to libexec and leaves only a helper on init. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/hotplug/Linux/Makefile | 3 + tools/hotplug/Linux/init.d/xendomains | 566 +------------------------------- tools/hotplug/Linux/xendomains | 584 +++++++++++++++++++++++++++++++++ 3 files changed, 603 insertions(+), 550 deletions(-) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 4874ec5..d5de9e6 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # Init scripts. XENDOMAINS_INITD =3D init.d/xendomains +XENDOMAINS_LIBEXEC =3D xendomains XENDOMAINS_SYSCONFIG =3D init.d/sysconfig.xendomains XENCOMMONS_INITD =3D init.d/xencommons @@ -45,6 +46,8 @@ install: all install-initd install-scripts install-udev install-initd: [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) + [ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC) + $(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC) $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR) $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index cad92da..d0122fc 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -1,18 +1,13 @@ #!/bin/bash # # /etc/init.d/xendomains -# Start / stop domains automatically when domain 0 boots / shuts down. +# Wrapper to start / stop domains automatically when domain 0 boots / shuts down # # chkconfig: 345 99 00 -# description: Start / stop Xen domains. +# description: Helper to start / stop Xen domains. # -# This script offers fairly basic functionality. It should work on Redhat -# but also on LSB-compliant SuSE releases and on Debian with the LSB package -# installed. (LSB is the Linux Standard Base) -# -# Based on the example in the "Designing High Quality Integrated Linux -# Applications HOWTO" by Avi Alkalay -# +# This script is a wrapper init helper for the real workload horse script. +# It should work on LSB-compliant systems. # ### BEGIN INIT INFO # Provides: xendomains @@ -22,563 +17,34 @@ # Should-Stop: xend # Default-Start: 2 3 5 # Default-Stop: 0 1 6 -# Short-Description: Start/stop secondary xen domains -# Description: Start / stop domains automatically when domain 0 -# boots / shuts down. +# Short-Description: Wrapper to start/stop secondary xen domains +# Description: Wrapper for starting / stopping domains automatically +# when domain 0 boots / shuts down on systems using init. +# The $SBINDIR/xendomains helper is shared between init and +# systemd systems. ### END INIT INFO . /etc/xen/scripts/hotplugpath.sh -CMD=3D${SBINDIR}/xl -HEADCOMP=3D"Xen saved domain" -$CMD list &> /dev/null -if test $=3F -ne 0 -then - exit $=3F -fi - -$CMD list &> /dev/null -if test $=3F -ne 0 -then - exit 0; -fi - -# Correct exit code would probably be 5, but it's enough -# if xend complains if we're not running as privileged domain -if ! [ -e /proc/xen/privcmd ]; then - exit 0 -fi - -# See docs/misc/distro_mapping.txt -if [ -d /var/lock/subsys ]; then - LOCKFILE=3D/var/lock/subsys/xendomains -else - LOCKFILE=3D/var/lock/xendomains -fi - -if [ -d /etc/sysconfig ]; then - XENDOM_CONFIG=3D/etc/sysconfig/xendomains -else - XENDOM_CONFIG=3D/etc/default/xendomains -fi - -test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; - if [ "$1" =3D "stop" ]; then exit 0; - else exit 6; fi; } - -. $XENDOM_CONFIG - -# Use the SUSE rc_ init script functions; -# emulate them on LSB, RH and other systems -if test -e /etc/rc.status; then - # SUSE rc script library - . /etc/rc.status -else - _cmd=3D$1 - declare -a _SMSG - if test "${_cmd}" =3D "status"; then - _SMSG=3D(running dead dead unused unknown) - _RC_UNUSED=3D3 - else - _SMSG=3D(done failed failed missed failed skipped unused failed failed) - _RC_UNUSED=3D6 - fi - if test -e /etc/init.d/functions; then - # REDHAT - . /etc/init.d/functions - echo_rc() - { - #echo -n " [${_SMSG[${_RC_RV}]}] " - if test ${_RC_RV} =3D 0; then - success " [${_SMSG[${_RC_RV}]}] " - else - failure " [${_SMSG[${_RC_RV}]}] " - fi - } - elif test -e /lib/lsb/init-functions; then - # LSB - . /lib/lsb/init-functions - if alias log_success_msg >/dev/null 2>/dev/null; then - echo_rc() - { - echo " [${_SMSG[${_RC_RV}]}] " - } - else - echo_rc() - { - if test ${_RC_RV} =3D 0; then - log_success_msg " [${_SMSG[${_RC_RV}]}] " - else - log_failure_msg " [${_SMSG[${_RC_RV}]}] " - fi - } - fi - else - # emulate it - echo_rc() - { - echo " [${_SMSG[${_RC_RV}]}] " - } - fi - rc_reset() { _RC_RV=3D0; } - rc_failed() - { - if test -z "$1"; then - _RC_RV=3D1; - elif test "$1" !=3D "0"; then - _RC_RV=3D$1; - fi - return ${_RC_RV} - } - rc_check() - { - return rc_failed $=3F - } - rc_status() - { - rc_failed $=3F - if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi - if test "$1" =3D "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi - if test "$1" =3D "-u"; then rc_failed ${_RC_UNUSED}; echo_rc; rc_failed 3; shift; fi - if test "$1" =3D "-v"; then echo_rc; shift; fi - if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi - return ${_RC_RV} - } - rc_exit() { exit ${_RC_RV}; } - rc_active() - { - if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi - if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi - return 1 - } -fi - -if ! which usleep >&/dev/null -then - usleep() - { - if [ -n "$1" ] - then - sleep $(( $1 / 1000000 )) - fi - } -fi - -# Reset status of this service -rc_reset - -## -# Returns 0 (success) if the given parameter names a directory, and that -# directory is not empty. -# -contains_something() -{ - if [ -d "$1" ] && [ `/bin/ls $1 | wc -l` -gt 0 ] - then - return 0 - else - return 1 - fi -} - -# read name from xen config file -rdname() -{ - NM=3D$($CMD create --quiet --dryrun --defconfig "$1" | - sed -n 's/^.*(name \(.*\))$/\1/p;s/^.*"name": "\(.*\)",$/\1/p') -} - -rdnames() -{ - NAMES=3D - if ! contains_something "$XENDOMAINS_AUTO" - then - return - fi - for dom in $XENDOMAINS_AUTO/*; do - rdname $dom - if test -z $NAMES; then - NAMES=3D$NM; - else - NAMES=3D"$NAMES|$NM" - fi - done -} - -LIST_GREP=3D'(domain\|(domid\|(name\|^ {$\|"name":\|"domid":' -parseln() -{ - if [[ "$1" =3D~ '(domain' ]] || [[ "$1" =3D "{" ]]; then - name=3D;id=3D - elif [[ "$1" =3D~ '(name' ]]; then - name=3D$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') - elif [[ "$1" =3D~ '(domid' ]]; then - id=3D$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') - elif [[ "$1" =3D~ '"name":' ]]; then - name=3D$(echo $1 | sed -e 's/^.*"name": "\(.*\)",$/\1/') - elif [[ "$1" =3D~ '"domid":' ]]; then - id=3D$(echo $1 | sed -e 's/^.*"domid": \(.*\),$/\1/') - fi - - [ -n "$name" -a -n "$id" ] && return 0 || return 1 -} - -is_running() -{ - rdname $1 - RC=3D1 - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - case $name in - ($NM) - RC=3D0 - ;; - esac - done < <($CMD list -l | grep "$LIST_GREP") - return $RC -} - -start() -{ - if [ -f $LOCKFILE ]; then - echo -e "xendomains already running (lockfile exists)" - return; - fi - - saved_domains=3D" " - if [ "$XENDOMAINS_RESTORE" =3D "true" ] && - contains_something "$XENDOMAINS_SAVE" - then - mkdir -p $(dirname "$LOCKFILE") - touch $LOCKFILE - echo -n "Restoring Xen domains:" - saved_domains=3D`ls $XENDOMAINS_SAVE` - for dom in $XENDOMAINS_SAVE/*; do - if [ -f $dom ] ; then - HEADER=3D`head -c 16 $dom | head -n 1 2> /dev/null` - if [ "$HEADER" =3D "$HEADCOMP" ]; then - echo -n " ${dom##*/}" - XMR=3D`$CMD restore $dom 2>&1 1>/dev/null` - #$CMD restore $dom - if [ $=3F -ne 0 ]; then - echo -e "\nAn error occurred while restoring domain ${dom##*/}:\n$XMR" - rc_failed $=3F - echo -e '!' - else - # mv $dom ${dom%/*}/.${dom##*/} - rm $dom - fi - fi - fi - done - echo -e - fi - - if contains_something "$XENDOMAINS_AUTO" - then - touch $LOCKFILE - echo -n "Starting auto Xen domains:" - # We expect config scripts for auto starting domains to be in - # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere - - # Create all domains with config files in XENDOMAINS_AUTO. - # TODO: We should record which domain name belongs - # so we have the option to selectively shut down / migrate later - # If a domain statefile from $XENDOMAINS_SAVE matches a domain name - # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't - # restore correctly it requires administrative attention. - for dom in $XENDOMAINS_AUTO/*; do - echo -n " ${dom##*/}" - shortdom=3D$(echo $dom | sed -n 's/^.*\/\(.*\)$/\1/p') - echo $saved_domains | grep -w $shortdom > /dev/null - if [ $=3F -eq 0 ] || is_running $dom; then - echo -n "(skip)" - else - XMC=3D`$CMD create --quiet --defconfig $dom` - if [ $=3F -ne 0 ]; then - echo -e "\nAn error occurred while creating domain ${dom##*/}: $XMC\n" - rc_failed $=3F - echo -e '!' - else - usleep $XENDOMAINS_CREATE_USLEEP - fi - fi - done - fi -} - -all_zombies() -{ - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - if test "$state" !=3D "-b---d" -a "$state" !=3D "-----d"; then - return 1; - fi - done < <($CMD list -l | grep "$LIST_GREP") - return 0 -} - -# Wait for max $XENDOMAINS_STOP_MAXWAIT for $CMD $1 to finish; -# if it has not exited by that time kill it, so the init script will -# succeed within a finite amount of time; if $2 is nonnull, it will -# kill the command as well as soon as no domain (except for zombies) -# are left (used for shutdown --all). Third parameter, if any, suppresses -# output of dots per working state (formatting issues) -watchdog_xencmd() -{ - if test -z "$XENDOMAINS_STOP_MAXWAIT" -o "$XENDOMAINS_STOP_MAXWAIT" =3D "0"; then - exit - fi - - usleep 20000 - for no in `seq 0 $XENDOMAINS_STOP_MAXWAIT`; do - # exit if $CMD save/migrate/shutdown is finished - PSAX=3D`ps axlw | grep "$CMD $1" | grep -v grep` - if test -z "$PSAX"; then exit; fi - if ! test -n "$3"; then echo -n '.'; fi - sleep 1 - # go to kill immediately if there's only zombies left - if all_zombies && test -n "$2"; then break; fi - done - sleep 1 - read PSF PSUID PSPID PSPPID < <(echo "$PSAX") - # kill $CMD $1 - kill $PSPID >/dev/null 2>&1 - - echo -e . -} - -stop() -{ - exec 3>&2 2> /dev/null - - # Collect list of domains to shut down - if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then - rdnames - fi - echo -n "Shutting down Xen domains:" - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - echo -n " $name" - if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then - eval " - case \"\$name\" in - ($NAMES) - # nothing - ;; - (*) - echo -e '(skip)' - continue - ;; - esac - " - fi - # XENDOMAINS_SYSRQ chould be something like just "s" - # or "s e i u" or even "s e s i u o" - # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so - if test -n "$XENDOMAINS_SYSRQ"; then - for sysrq in $XENDOMAINS_SYSRQ; do - echo -n "(SR-$sysrq)" - XMR=3D`$CMD sysrq $id $sysrq 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while doing sysrq on domain:\n$XMR\n" - rc_failed $=3F - echo -n '!' - fi - # usleep just ignores empty arg - usleep $XENDOMAINS_USLEEP - done - fi - if test "$state" =3D "-b---d" -o "$state" =3D "-----d"; then - echo -n "(zomb)" - continue - fi - if test -n "$XENDOMAINS_MIGRATE"; then - echo -n "(migr)" - watchdog_xencmd migrate & - WDOG_PID=3D$! - XMR=3D`$CMD migrate $id $XENDOMAINS_MIGRATE 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while migrating domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - - kill $WDOG_PID >/dev/null 2>&1 - else - kill $WDOG_PID >/dev/null 2>&1 - - echo -e . - usleep 1000 - continue - fi - fi - if test -n "$XENDOMAINS_SAVE"; then - echo -n "(save)" - watchdog_xencmd save & - WDOG_PID=3D$! - mkdir -p "$XENDOMAINS_SAVE" - XMR=3D`$CMD save $id $XENDOMAINS_SAVE/$name 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while saving domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - kill $WDOG_PID >/dev/null 2>&1 - else - kill $WDOG_PID >/dev/null 2>&1 - echo -e . - usleep 1000 - continue - fi - fi - if test -n "$XENDOMAINS_SHUTDOWN"; then - # XENDOMAINS_SHUTDOWN should be "--wait" - echo -n "(shut)" - watchdog_xencmd shutdown & - WDOG_PID=3D$! - XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN $id 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while shutting down domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - fi - kill $WDOG_PID >/dev/null 2>&1 - fi - done < <($CMD list -l | grep "$LIST_GREP") - - # NB. this shuts down ALL Xen domains (politely), not just the ones in - # AUTODIR/* - # This is because it's easier to do ;-) but arguably if this script is run - # on system shutdown then it's also the right thing to do. - if ! all_zombies && test -n "$XENDOMAINS_SHUTDOWN_ALL"; then - # XENDOMAINS_SHUTDOWN_ALL should be "--all --wait" - echo -n " SHUTDOWN_ALL " - watchdog_xencmd shutdown 1 false & - WDOG_PID=3D$! - XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN_ALL 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while shutting down all domains: $XMR\n" - rc_failed $=3F - echo -e '!' - fi - kill $WDOG_PID >/dev/null 2>&1 - fi - - # Unconditionally delete lock file - rm -f $LOCKFILE - - exec 2>&3 -} - -check_domain_up() -{ - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - case $name in - ($1) - return 0 - ;; - esac - done < <($CMD list -l | grep "$LIST_GREP") - return 1 -} - -check_all_auto_domains_up() -{ - if ! contains_something "$XENDOMAINS_AUTO" - then - return 0 - fi - missing=3D - for nm in $XENDOMAINS_AUTO/*; do - rdname $nm - found=3D0 - if check_domain_up "$NM"; then - echo -n " $name" - else - missing=3D"$missing $NM" - fi - done - if test -n "$missing"; then - echo -n " MISS AUTO:$missing" - return 1 - fi - return 0 -} - -check_all_saved_domains_up() -{ - if ! contains_something "$XENDOMAINS_SAVE" - then - return 0 - fi - missing=3D`/bin/ls $XENDOMAINS_SAVE` - echo -n " MISS SAVED: " $missing - return 1 -} - -# This does NOT necessarily restart all running domains: instead it -# stops all running domains and then boots all the domains specified in -# AUTODIR. If other domains have been started manually then they will -# not get restarted. -# Commented out to avoid confusion! - -restart() -{ - stop - start -} - -reload() -{ - restart -} - - case "$1" in start) - start - rc_status - if test -f $LOCKFILE; then rc_status -v; fi + $SBINDIR/xendomains start ;; - stop) - stop - rc_status -v + $SBINDIR/xendomains stop ;; - restart) - restart + $SBINDIR/xendomains restart ;; reload) - reload + $SBINDIR/xendomains reload ;; - status) - echo -n "Checking for xendomains:" - if test ! -f $LOCKFILE; then - rc_failed 3 - else - check_all_auto_domains_up - rc_status - check_all_saved_domains_up - rc_status - fi - rc_status -v + $SBINDIR/xendomains status ;; - *) echo "Usage: $0 {start|stop|restart|reload|status}" - rc_failed 3 - rc_status -v + exit 3 ;; esac - -rc_exit +exit $=3F diff --git a/tools/hotplug/Linux/xendomains b/tools/hotplug/Linux/xendomains new file mode 100644 index 0000000..0794bb9 --- /dev/null +++ b/tools/hotplug/Linux/xendomains @@ -0,0 +1,584 @@ +#!/bin/bash +# +# /etc/init.d/xendomains +# Start / stop domains automatically when domain 0 boots / shuts down. +# +# chkconfig: 345 99 00 +# description: Start / stop Xen domains. +# +# This script offers fairly basic functionality. It should work on Redhat +# but also on LSB-compliant SuSE releases and on Debian with the LSB package +# installed. (LSB is the Linux Standard Base) +# +# Based on the example in the "Designing High Quality Integrated Linux +# Applications HOWTO" by Avi Alkalay +# +# +### BEGIN INIT INFO +# Provides: xendomains +# Required-Start: $syslog $remote_fs xenstored xenconsoled +# Should-Start: xend +# Required-Stop: $syslog $remote_fs xenstored xenconsoled +# Should-Stop: xend +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop secondary xen domains +# Description: Start / stop domains automatically when domain 0 +# boots / shuts down. +### END INIT INFO + +. /etc/xen/scripts/hotplugpath.sh + +CMD=3D${SBINDIR}/xl +HEADCOMP=3D"Xen saved domain" +$CMD list &> /dev/null +if test $=3F -ne 0 +then + exit $=3F +fi + +$CMD list &> /dev/null +if test $=3F -ne 0 +then + exit 0; +fi + +# Correct exit code would probably be 5, but it's enough +# if xend complains if we're not running as privileged domain +if ! [ -e /proc/xen/privcmd ]; then + exit 0 +fi + +# See docs/misc/distro_mapping.txt +if [ -d /var/lock/subsys ]; then + LOCKFILE=3D/var/lock/subsys/xendomains +else + LOCKFILE=3D/var/lock/xendomains +fi + +if [ -d /etc/sysconfig ]; then + XENDOM_CONFIG=3D/etc/sysconfig/xendomains +else + XENDOM_CONFIG=3D/etc/default/xendomains +fi + +test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; + if [ "$1" =3D "stop" ]; then exit 0; + else exit 6; fi; } + +. $XENDOM_CONFIG + +# Use the SUSE rc_ init script functions; +# emulate them on LSB, RH and other systems +if test -e /etc/rc.status; then + # SUSE rc script library + . /etc/rc.status +else + _cmd=3D$1 + declare -a _SMSG + if test "${_cmd}" =3D "status"; then + _SMSG=3D(running dead dead unused unknown) + _RC_UNUSED=3D3 + else + _SMSG=3D(done failed failed missed failed skipped unused failed failed) + _RC_UNUSED=3D6 + fi + if test -e /etc/init.d/functions; then + # REDHAT + . /etc/init.d/functions + echo_rc() + { + #echo -n " [${_SMSG[${_RC_RV}]}] " + if test ${_RC_RV} =3D 0; then + success " [${_SMSG[${_RC_RV}]}] " + else + failure " [${_SMSG[${_RC_RV}]}] " + fi + } + elif test -e /lib/lsb/init-functions; then + # LSB + . /lib/lsb/init-functions + if alias log_success_msg >/dev/null 2>/dev/null; then + echo_rc() + { + echo " [${_SMSG[${_RC_RV}]}] " + } + else + echo_rc() + { + if test ${_RC_RV} =3D 0; then + log_success_msg " [${_SMSG[${_RC_RV}]}] " + else + log_failure_msg " [${_SMSG[${_RC_RV}]}] " + fi + } + fi + else + # emulate it + echo_rc() + { + echo " [${_SMSG[${_RC_RV}]}] " + } + fi + rc_reset() { _RC_RV=3D0; } + rc_failed() + { + if test -z "$1"; then + _RC_RV=3D1; + elif test "$1" !=3D "0"; then + _RC_RV=3D$1; + fi + return ${_RC_RV} + } + rc_check() + { + return rc_failed $=3F + } + rc_status() + { + rc_failed $=3F + if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi + if test "$1" =3D "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi + if test "$1" =3D "-u"; then rc_failed ${_RC_UNUSED}; echo_rc; rc_failed 3; shift; fi + if test "$1" =3D "-v"; then echo_rc; shift; fi + if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi + return ${_RC_RV} + } + rc_exit() { exit ${_RC_RV}; } + rc_active() + { + if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi + if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi + return 1 + } +fi + +if ! which usleep >&/dev/null +then + usleep() + { + if [ -n "$1" ] + then + sleep $(( $1 / 1000000 )) + fi + } +fi + +# Reset status of this service +rc_reset + +## +# Returns 0 (success) if the given parameter names a directory, and that +# directory is not empty. +# +contains_something() +{ + if [ -d "$1" ] && [ `/bin/ls $1 | wc -l` -gt 0 ] + then + return 0 + else + return 1 + fi +} + +# read name from xen config file +rdname() +{ + NM=3D$($CMD create --quiet --dryrun --defconfig "$1" | + sed -n 's/^.*(name \(.*\))$/\1/p;s/^.*"name": "\(.*\)",$/\1/p') +} + +rdnames() +{ + NAMES=3D + if ! contains_something "$XENDOMAINS_AUTO" + then + return + fi + for dom in $XENDOMAINS_AUTO/*; do + rdname $dom + if test -z $NAMES; then + NAMES=3D$NM; + else + NAMES=3D"$NAMES|$NM" + fi + done +} + +LIST_GREP=3D'(domain\|(domid\|(name\|^ {$\|"name":\|"domid":' +parseln() +{ + if [[ "$1" =3D~ '(domain' ]] || [[ "$1" =3D "{" ]]; then + name=3D;id=3D + elif [[ "$1" =3D~ '(name' ]]; then + name=3D$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') + elif [[ "$1" =3D~ '(domid' ]]; then + id=3D$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') + elif [[ "$1" =3D~ '"name":' ]]; then + name=3D$(echo $1 | sed -e 's/^.*"name": "\(.*\)",$/\1/') + elif [[ "$1" =3D~ '"domid":' ]]; then + id=3D$(echo $1 | sed -e 's/^.*"domid": \(.*\),$/\1/') + fi + + [ -n "$name" -a -n "$id" ] && return 0 || return 1 +} + +is_running() +{ + rdname $1 + RC=3D1 + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + case $name in + ($NM) + RC=3D0 + ;; + esac + done < <($CMD list -l | grep "$LIST_GREP") + return $RC +} + +start() +{ + if [ -f $LOCKFILE ]; then + echo -e "xendomains already running (lockfile exists)" + return; + fi + + saved_domains=3D" " + if [ "$XENDOMAINS_RESTORE" =3D "true" ] && + contains_something "$XENDOMAINS_SAVE" + then + mkdir -p $(dirname "$LOCKFILE") + touch $LOCKFILE + echo -n "Restoring Xen domains:" + saved_domains=3D`ls $XENDOMAINS_SAVE` + for dom in $XENDOMAINS_SAVE/*; do + if [ -f $dom ] ; then + HEADER=3D`head -c 16 $dom | head -n 1 2> /dev/null` + if [ "$HEADER" =3D "$HEADCOMP" ]; then + echo -n " ${dom##*/}" + XMR=3D`$CMD restore $dom 2>&1 1>/dev/null` + #$CMD restore $dom + if [ $=3F -ne 0 ]; then + echo -e "\nAn error occurred while restoring domain ${dom##*/}:\n$XMR" + rc_failed $=3F + echo -e '!' + else + # mv $dom ${dom%/*}/.${dom##*/} + rm $dom + fi + fi + fi + done + echo -e + fi + + if contains_something "$XENDOMAINS_AUTO" + then + touch $LOCKFILE + echo -n "Starting auto Xen domains:" + # We expect config scripts for auto starting domains to be in + # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere + + # Create all domains with config files in XENDOMAINS_AUTO. + # TODO: We should record which domain name belongs + # so we have the option to selectively shut down / migrate later + # If a domain statefile from $XENDOMAINS_SAVE matches a domain name + # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't + # restore correctly it requires administrative attention. + for dom in $XENDOMAINS_AUTO/*; do + echo -n " ${dom##*/}" + shortdom=3D$(echo $dom | sed -n 's/^.*\/\(.*\)$/\1/p') + echo $saved_domains | grep -w $shortdom > /dev/null + if [ $=3F -eq 0 ] || is_running $dom; then + echo -n "(skip)" + else + XMC=3D`$CMD create --quiet --defconfig $dom` + if [ $=3F -ne 0 ]; then + echo -e "\nAn error occurred while creating domain ${dom##*/}: $XMC\n" + rc_failed $=3F + echo -e '!' + else + usleep $XENDOMAINS_CREATE_USLEEP + fi + fi + done + fi +} + +all_zombies() +{ + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + if test "$state" !=3D "-b---d" -a "$state" !=3D "-----d"; then + return 1; + fi + done < <($CMD list -l | grep "$LIST_GREP") + return 0 +} + +# Wait for max $XENDOMAINS_STOP_MAXWAIT for $CMD $1 to finish; +# if it has not exited by that time kill it, so the init script will +# succeed within a finite amount of time; if $2 is nonnull, it will +# kill the command as well as soon as no domain (except for zombies) +# are left (used for shutdown --all). Third parameter, if any, suppresses +# output of dots per working state (formatting issues) +watchdog_xencmd() +{ + if test -z "$XENDOMAINS_STOP_MAXWAIT" -o "$XENDOMAINS_STOP_MAXWAIT" =3D "0"; then + exit + fi + + usleep 20000 + for no in `seq 0 $XENDOMAINS_STOP_MAXWAIT`; do + # exit if $CMD save/migrate/shutdown is finished + PSAX=3D`ps axlw | grep "$CMD $1" | grep -v grep` + if test -z "$PSAX"; then exit; fi + if ! test -n "$3"; then echo -n '.'; fi + sleep 1 + # go to kill immediately if there's only zombies left + if all_zombies && test -n "$2"; then break; fi + done + sleep 1 + read PSF PSUID PSPID PSPPID < <(echo "$PSAX") + # kill $CMD $1 + kill $PSPID >/dev/null 2>&1 + + echo -e . +} + +stop() +{ + exec 3>&2 2> /dev/null + + # Collect list of domains to shut down + if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then + rdnames + fi + echo -n "Shutting down Xen domains:" + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + echo -n " $name" + if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then + eval " + case \"\$name\" in + ($NAMES) + # nothing + ;; + (*) + echo -e '(skip)' + continue + ;; + esac + " + fi + # XENDOMAINS_SYSRQ chould be something like just "s" + # or "s e i u" or even "s e s i u o" + # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so + if test -n "$XENDOMAINS_SYSRQ"; then + for sysrq in $XENDOMAINS_SYSRQ; do + echo -n "(SR-$sysrq)" + XMR=3D`$CMD sysrq $id $sysrq 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while doing sysrq on domain:\n$XMR\n" + rc_failed $=3F + echo -n '!' + fi + # usleep just ignores empty arg + usleep $XENDOMAINS_USLEEP + done + fi + if test "$state" =3D "-b---d" -o "$state" =3D "-----d"; then + echo -n "(zomb)" + continue + fi + if test -n "$XENDOMAINS_MIGRATE"; then + echo -n "(migr)" + watchdog_xencmd migrate & + WDOG_PID=3D$! + XMR=3D`$CMD migrate $id $XENDOMAINS_MIGRATE 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while migrating domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + + kill $WDOG_PID >/dev/null 2>&1 + else + kill $WDOG_PID >/dev/null 2>&1 + + echo -e . + usleep 1000 + continue + fi + fi + if test -n "$XENDOMAINS_SAVE"; then + echo -n "(save)" + watchdog_xencmd save & + WDOG_PID=3D$! + mkdir -p "$XENDOMAINS_SAVE" + XMR=3D`$CMD save $id $XENDOMAINS_SAVE/$name 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while saving domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + kill $WDOG_PID >/dev/null 2>&1 + else + kill $WDOG_PID >/dev/null 2>&1 + echo -e . + usleep 1000 + continue + fi + fi + if test -n "$XENDOMAINS_SHUTDOWN"; then + # XENDOMAINS_SHUTDOWN should be "--wait" + echo -n "(shut)" + watchdog_xencmd shutdown & + WDOG_PID=3D$! + XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN $id 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while shutting down domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + fi + kill $WDOG_PID >/dev/null 2>&1 + fi + done < <($CMD list -l | grep "$LIST_GREP") + + # NB. this shuts down ALL Xen domains (politely), not just the ones in + # AUTODIR/* + # This is because it's easier to do ;-) but arguably if this script is run + # on system shutdown then it's also the right thing to do. + if ! all_zombies && test -n "$XENDOMAINS_SHUTDOWN_ALL"; then + # XENDOMAINS_SHUTDOWN_ALL should be "--all --wait" + echo -n " SHUTDOWN_ALL " + watchdog_xencmd shutdown 1 false & + WDOG_PID=3D$! + XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN_ALL 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while shutting down all domains: $XMR\n" + rc_failed $=3F + echo -e '!' + fi + kill $WDOG_PID >/dev/null 2>&1 + fi + + # Unconditionally delete lock file + rm -f $LOCKFILE + + exec 2>&3 +} + +check_domain_up() +{ + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + case $name in + ($1) + return 0 + ;; + esac + done < <($CMD list -l | grep "$LIST_GREP") + return 1 +} + +check_all_auto_domains_up() +{ + if ! contains_something "$XENDOMAINS_AUTO" + then + return 0 + fi + missing=3D + for nm in $XENDOMAINS_AUTO/*; do + rdname $nm + found=3D0 + if check_domain_up "$NM"; then + echo -n " $name" + else + missing=3D"$missing $NM" + fi + done + if test -n "$missing"; then + echo -n " MISS AUTO:$missing" + return 1 + fi + return 0 +} + +check_all_saved_domains_up() +{ + if ! contains_something "$XENDOMAINS_SAVE" + then + return 0 + fi + missing=3D`/bin/ls $XENDOMAINS_SAVE` + echo -n " MISS SAVED: " $missing + return 1 +} + +# This does NOT necessarily restart all running domains: instead it +# stops all running domains and then boots all the domains specified in +# AUTODIR. If other domains have been started manually then they will +# not get restarted. +# Commented out to avoid confusion! + +restart() +{ + stop + start +} + +reload() +{ + restart +} + + +case "$1" in + start) + start + rc_status + if test -f $LOCKFILE; then rc_status -v; fi + ;; + + stop) + stop + rc_status -v + ;; + + restart) + restart + ;; + reload) + reload + ;; + + status) + echo -n "Checking for xendomains:" + if test ! -f $LOCKFILE; then + rc_failed 3 + else + check_all_auto_domains_up + rc_status + check_all_saved_domains_up + rc_status + fi + rc_status -v + ;; + + *) + echo "Usage: $0 {start|stop|restart|reload|status}" + rc_failed 3 + rc_status -v + ;; +esac + +rc_exit -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4814925661014454301== 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 --===============4814925661014454301==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGO-0002wl-7d; Sat, 05 Jul 2014 16:56:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGN-0002wb-6Z for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:35 +0000 Content-Length: 32751 Received: from [85.158.139.211:27337] by server-6.bemta-5.messagelabs.com id CF/83-25531-24E28B35; Sat, 05 Jul 2014 16:56:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404579391!8450031!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1241 invoked from network); 5 Jul 2014 16:56:32 -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; 5 Jul 2014 16:56:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGI-0006OL-UU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGI-00031C-S1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:30 +0000 Date: Sat, 05 Jul 2014 16:56:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xendomains: move to libexec and use a smaller init helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4814925661014454301==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4814925661014454301== Content-Length: 33542 Content-Transfer-Encoding: quoted-printable commit d8bad9df2544291a0fdc8e4d826b16f9f5394462 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:45 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:29 2014 +0100 tools/xendomains: move to libexec and use a smaller init helper The xendomains script can be reused with systemd systems as it does not control services or sockets per se, but does a one shot scrape of domUs it needs start bring up, stop, reload so we're going to reuse it. This moves the core of the script to libexec and leaves only a helper on init. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/hotplug/Linux/Makefile | 3 + tools/hotplug/Linux/init.d/xendomains | 566 +------------------------------- tools/hotplug/Linux/xendomains | 584 +++++++++++++++++++++++++++++++++ 3 files changed, 603 insertions(+), 550 deletions(-) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 4874ec5..d5de9e6 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # Init scripts. XENDOMAINS_INITD =3D init.d/xendomains +XENDOMAINS_LIBEXEC =3D xendomains XENDOMAINS_SYSCONFIG =3D init.d/sysconfig.xendomains XENCOMMONS_INITD =3D init.d/xencommons @@ -45,6 +46,8 @@ install: all install-initd install-scripts install-udev install-initd: [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) + [ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC) + $(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC) $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR) $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index cad92da..d0122fc 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -1,18 +1,13 @@ #!/bin/bash # # /etc/init.d/xendomains -# Start / stop domains automatically when domain 0 boots / shuts down. +# Wrapper to start / stop domains automatically when domain 0 boots / shuts down # # chkconfig: 345 99 00 -# description: Start / stop Xen domains. +# description: Helper to start / stop Xen domains. # -# This script offers fairly basic functionality. It should work on Redhat -# but also on LSB-compliant SuSE releases and on Debian with the LSB package -# installed. (LSB is the Linux Standard Base) -# -# Based on the example in the "Designing High Quality Integrated Linux -# Applications HOWTO" by Avi Alkalay -# +# This script is a wrapper init helper for the real workload horse script. +# It should work on LSB-compliant systems. # ### BEGIN INIT INFO # Provides: xendomains @@ -22,563 +17,34 @@ # Should-Stop: xend # Default-Start: 2 3 5 # Default-Stop: 0 1 6 -# Short-Description: Start/stop secondary xen domains -# Description: Start / stop domains automatically when domain 0 -# boots / shuts down. +# Short-Description: Wrapper to start/stop secondary xen domains +# Description: Wrapper for starting / stopping domains automatically +# when domain 0 boots / shuts down on systems using init. +# The $SBINDIR/xendomains helper is shared between init and +# systemd systems. ### END INIT INFO . /etc/xen/scripts/hotplugpath.sh -CMD=3D${SBINDIR}/xl -HEADCOMP=3D"Xen saved domain" -$CMD list &> /dev/null -if test $=3F -ne 0 -then - exit $=3F -fi - -$CMD list &> /dev/null -if test $=3F -ne 0 -then - exit 0; -fi - -# Correct exit code would probably be 5, but it's enough -# if xend complains if we're not running as privileged domain -if ! [ -e /proc/xen/privcmd ]; then - exit 0 -fi - -# See docs/misc/distro_mapping.txt -if [ -d /var/lock/subsys ]; then - LOCKFILE=3D/var/lock/subsys/xendomains -else - LOCKFILE=3D/var/lock/xendomains -fi - -if [ -d /etc/sysconfig ]; then - XENDOM_CONFIG=3D/etc/sysconfig/xendomains -else - XENDOM_CONFIG=3D/etc/default/xendomains -fi - -test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; - if [ "$1" =3D "stop" ]; then exit 0; - else exit 6; fi; } - -. $XENDOM_CONFIG - -# Use the SUSE rc_ init script functions; -# emulate them on LSB, RH and other systems -if test -e /etc/rc.status; then - # SUSE rc script library - . /etc/rc.status -else - _cmd=3D$1 - declare -a _SMSG - if test "${_cmd}" =3D "status"; then - _SMSG=3D(running dead dead unused unknown) - _RC_UNUSED=3D3 - else - _SMSG=3D(done failed failed missed failed skipped unused failed failed) - _RC_UNUSED=3D6 - fi - if test -e /etc/init.d/functions; then - # REDHAT - . /etc/init.d/functions - echo_rc() - { - #echo -n " [${_SMSG[${_RC_RV}]}] " - if test ${_RC_RV} =3D 0; then - success " [${_SMSG[${_RC_RV}]}] " - else - failure " [${_SMSG[${_RC_RV}]}] " - fi - } - elif test -e /lib/lsb/init-functions; then - # LSB - . /lib/lsb/init-functions - if alias log_success_msg >/dev/null 2>/dev/null; then - echo_rc() - { - echo " [${_SMSG[${_RC_RV}]}] " - } - else - echo_rc() - { - if test ${_RC_RV} =3D 0; then - log_success_msg " [${_SMSG[${_RC_RV}]}] " - else - log_failure_msg " [${_SMSG[${_RC_RV}]}] " - fi - } - fi - else - # emulate it - echo_rc() - { - echo " [${_SMSG[${_RC_RV}]}] " - } - fi - rc_reset() { _RC_RV=3D0; } - rc_failed() - { - if test -z "$1"; then - _RC_RV=3D1; - elif test "$1" !=3D "0"; then - _RC_RV=3D$1; - fi - return ${_RC_RV} - } - rc_check() - { - return rc_failed $=3F - } - rc_status() - { - rc_failed $=3F - if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi - if test "$1" =3D "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi - if test "$1" =3D "-u"; then rc_failed ${_RC_UNUSED}; echo_rc; rc_failed 3; shift; fi - if test "$1" =3D "-v"; then echo_rc; shift; fi - if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi - return ${_RC_RV} - } - rc_exit() { exit ${_RC_RV}; } - rc_active() - { - if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi - if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi - return 1 - } -fi - -if ! which usleep >&/dev/null -then - usleep() - { - if [ -n "$1" ] - then - sleep $(( $1 / 1000000 )) - fi - } -fi - -# Reset status of this service -rc_reset - -## -# Returns 0 (success) if the given parameter names a directory, and that -# directory is not empty. -# -contains_something() -{ - if [ -d "$1" ] && [ `/bin/ls $1 | wc -l` -gt 0 ] - then - return 0 - else - return 1 - fi -} - -# read name from xen config file -rdname() -{ - NM=3D$($CMD create --quiet --dryrun --defconfig "$1" | - sed -n 's/^.*(name \(.*\))$/\1/p;s/^.*"name": "\(.*\)",$/\1/p') -} - -rdnames() -{ - NAMES=3D - if ! contains_something "$XENDOMAINS_AUTO" - then - return - fi - for dom in $XENDOMAINS_AUTO/*; do - rdname $dom - if test -z $NAMES; then - NAMES=3D$NM; - else - NAMES=3D"$NAMES|$NM" - fi - done -} - -LIST_GREP=3D'(domain\|(domid\|(name\|^ {$\|"name":\|"domid":' -parseln() -{ - if [[ "$1" =3D~ '(domain' ]] || [[ "$1" =3D "{" ]]; then - name=3D;id=3D - elif [[ "$1" =3D~ '(name' ]]; then - name=3D$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') - elif [[ "$1" =3D~ '(domid' ]]; then - id=3D$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') - elif [[ "$1" =3D~ '"name":' ]]; then - name=3D$(echo $1 | sed -e 's/^.*"name": "\(.*\)",$/\1/') - elif [[ "$1" =3D~ '"domid":' ]]; then - id=3D$(echo $1 | sed -e 's/^.*"domid": \(.*\),$/\1/') - fi - - [ -n "$name" -a -n "$id" ] && return 0 || return 1 -} - -is_running() -{ - rdname $1 - RC=3D1 - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - case $name in - ($NM) - RC=3D0 - ;; - esac - done < <($CMD list -l | grep "$LIST_GREP") - return $RC -} - -start() -{ - if [ -f $LOCKFILE ]; then - echo -e "xendomains already running (lockfile exists)" - return; - fi - - saved_domains=3D" " - if [ "$XENDOMAINS_RESTORE" =3D "true" ] && - contains_something "$XENDOMAINS_SAVE" - then - mkdir -p $(dirname "$LOCKFILE") - touch $LOCKFILE - echo -n "Restoring Xen domains:" - saved_domains=3D`ls $XENDOMAINS_SAVE` - for dom in $XENDOMAINS_SAVE/*; do - if [ -f $dom ] ; then - HEADER=3D`head -c 16 $dom | head -n 1 2> /dev/null` - if [ "$HEADER" =3D "$HEADCOMP" ]; then - echo -n " ${dom##*/}" - XMR=3D`$CMD restore $dom 2>&1 1>/dev/null` - #$CMD restore $dom - if [ $=3F -ne 0 ]; then - echo -e "\nAn error occurred while restoring domain ${dom##*/}:\n$XMR" - rc_failed $=3F - echo -e '!' - else - # mv $dom ${dom%/*}/.${dom##*/} - rm $dom - fi - fi - fi - done - echo -e - fi - - if contains_something "$XENDOMAINS_AUTO" - then - touch $LOCKFILE - echo -n "Starting auto Xen domains:" - # We expect config scripts for auto starting domains to be in - # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere - - # Create all domains with config files in XENDOMAINS_AUTO. - # TODO: We should record which domain name belongs - # so we have the option to selectively shut down / migrate later - # If a domain statefile from $XENDOMAINS_SAVE matches a domain name - # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't - # restore correctly it requires administrative attention. - for dom in $XENDOMAINS_AUTO/*; do - echo -n " ${dom##*/}" - shortdom=3D$(echo $dom | sed -n 's/^.*\/\(.*\)$/\1/p') - echo $saved_domains | grep -w $shortdom > /dev/null - if [ $=3F -eq 0 ] || is_running $dom; then - echo -n "(skip)" - else - XMC=3D`$CMD create --quiet --defconfig $dom` - if [ $=3F -ne 0 ]; then - echo -e "\nAn error occurred while creating domain ${dom##*/}: $XMC\n" - rc_failed $=3F - echo -e '!' - else - usleep $XENDOMAINS_CREATE_USLEEP - fi - fi - done - fi -} - -all_zombies() -{ - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - if test "$state" !=3D "-b---d" -a "$state" !=3D "-----d"; then - return 1; - fi - done < <($CMD list -l | grep "$LIST_GREP") - return 0 -} - -# Wait for max $XENDOMAINS_STOP_MAXWAIT for $CMD $1 to finish; -# if it has not exited by that time kill it, so the init script will -# succeed within a finite amount of time; if $2 is nonnull, it will -# kill the command as well as soon as no domain (except for zombies) -# are left (used for shutdown --all). Third parameter, if any, suppresses -# output of dots per working state (formatting issues) -watchdog_xencmd() -{ - if test -z "$XENDOMAINS_STOP_MAXWAIT" -o "$XENDOMAINS_STOP_MAXWAIT" =3D "0"; then - exit - fi - - usleep 20000 - for no in `seq 0 $XENDOMAINS_STOP_MAXWAIT`; do - # exit if $CMD save/migrate/shutdown is finished - PSAX=3D`ps axlw | grep "$CMD $1" | grep -v grep` - if test -z "$PSAX"; then exit; fi - if ! test -n "$3"; then echo -n '.'; fi - sleep 1 - # go to kill immediately if there's only zombies left - if all_zombies && test -n "$2"; then break; fi - done - sleep 1 - read PSF PSUID PSPID PSPPID < <(echo "$PSAX") - # kill $CMD $1 - kill $PSPID >/dev/null 2>&1 - - echo -e . -} - -stop() -{ - exec 3>&2 2> /dev/null - - # Collect list of domains to shut down - if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then - rdnames - fi - echo -n "Shutting down Xen domains:" - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - echo -n " $name" - if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then - eval " - case \"\$name\" in - ($NAMES) - # nothing - ;; - (*) - echo -e '(skip)' - continue - ;; - esac - " - fi - # XENDOMAINS_SYSRQ chould be something like just "s" - # or "s e i u" or even "s e s i u o" - # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so - if test -n "$XENDOMAINS_SYSRQ"; then - for sysrq in $XENDOMAINS_SYSRQ; do - echo -n "(SR-$sysrq)" - XMR=3D`$CMD sysrq $id $sysrq 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while doing sysrq on domain:\n$XMR\n" - rc_failed $=3F - echo -n '!' - fi - # usleep just ignores empty arg - usleep $XENDOMAINS_USLEEP - done - fi - if test "$state" =3D "-b---d" -o "$state" =3D "-----d"; then - echo -n "(zomb)" - continue - fi - if test -n "$XENDOMAINS_MIGRATE"; then - echo -n "(migr)" - watchdog_xencmd migrate & - WDOG_PID=3D$! - XMR=3D`$CMD migrate $id $XENDOMAINS_MIGRATE 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while migrating domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - - kill $WDOG_PID >/dev/null 2>&1 - else - kill $WDOG_PID >/dev/null 2>&1 - - echo -e . - usleep 1000 - continue - fi - fi - if test -n "$XENDOMAINS_SAVE"; then - echo -n "(save)" - watchdog_xencmd save & - WDOG_PID=3D$! - mkdir -p "$XENDOMAINS_SAVE" - XMR=3D`$CMD save $id $XENDOMAINS_SAVE/$name 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while saving domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - kill $WDOG_PID >/dev/null 2>&1 - else - kill $WDOG_PID >/dev/null 2>&1 - echo -e . - usleep 1000 - continue - fi - fi - if test -n "$XENDOMAINS_SHUTDOWN"; then - # XENDOMAINS_SHUTDOWN should be "--wait" - echo -n "(shut)" - watchdog_xencmd shutdown & - WDOG_PID=3D$! - XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN $id 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while shutting down domain:\n$XMR\n" - rc_failed $=3F - echo -e '!' - fi - kill $WDOG_PID >/dev/null 2>&1 - fi - done < <($CMD list -l | grep "$LIST_GREP") - - # NB. this shuts down ALL Xen domains (politely), not just the ones in - # AUTODIR/* - # This is because it's easier to do ;-) but arguably if this script is run - # on system shutdown then it's also the right thing to do. - if ! all_zombies && test -n "$XENDOMAINS_SHUTDOWN_ALL"; then - # XENDOMAINS_SHUTDOWN_ALL should be "--all --wait" - echo -n " SHUTDOWN_ALL " - watchdog_xencmd shutdown 1 false & - WDOG_PID=3D$! - XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN_ALL 2>&1 1>/dev/null` - if test $=3F -ne 0; then - echo -e "\nAn error occurred while shutting down all domains: $XMR\n" - rc_failed $=3F - echo -e '!' - fi - kill $WDOG_PID >/dev/null 2>&1 - fi - - # Unconditionally delete lock file - rm -f $LOCKFILE - - exec 2>&3 -} - -check_domain_up() -{ - name=3D;id=3D - while read LN; do - parseln "$LN" || continue - if test $id =3D 0; then continue; fi - case $name in - ($1) - return 0 - ;; - esac - done < <($CMD list -l | grep "$LIST_GREP") - return 1 -} - -check_all_auto_domains_up() -{ - if ! contains_something "$XENDOMAINS_AUTO" - then - return 0 - fi - missing=3D - for nm in $XENDOMAINS_AUTO/*; do - rdname $nm - found=3D0 - if check_domain_up "$NM"; then - echo -n " $name" - else - missing=3D"$missing $NM" - fi - done - if test -n "$missing"; then - echo -n " MISS AUTO:$missing" - return 1 - fi - return 0 -} - -check_all_saved_domains_up() -{ - if ! contains_something "$XENDOMAINS_SAVE" - then - return 0 - fi - missing=3D`/bin/ls $XENDOMAINS_SAVE` - echo -n " MISS SAVED: " $missing - return 1 -} - -# This does NOT necessarily restart all running domains: instead it -# stops all running domains and then boots all the domains specified in -# AUTODIR. If other domains have been started manually then they will -# not get restarted. -# Commented out to avoid confusion! - -restart() -{ - stop - start -} - -reload() -{ - restart -} - - case "$1" in start) - start - rc_status - if test -f $LOCKFILE; then rc_status -v; fi + $SBINDIR/xendomains start ;; - stop) - stop - rc_status -v + $SBINDIR/xendomains stop ;; - restart) - restart + $SBINDIR/xendomains restart ;; reload) - reload + $SBINDIR/xendomains reload ;; - status) - echo -n "Checking for xendomains:" - if test ! -f $LOCKFILE; then - rc_failed 3 - else - check_all_auto_domains_up - rc_status - check_all_saved_domains_up - rc_status - fi - rc_status -v + $SBINDIR/xendomains status ;; - *) echo "Usage: $0 {start|stop|restart|reload|status}" - rc_failed 3 - rc_status -v + exit 3 ;; esac - -rc_exit +exit $=3F diff --git a/tools/hotplug/Linux/xendomains b/tools/hotplug/Linux/xendomains new file mode 100644 index 0000000..0794bb9 --- /dev/null +++ b/tools/hotplug/Linux/xendomains @@ -0,0 +1,584 @@ +#!/bin/bash +# +# /etc/init.d/xendomains +# Start / stop domains automatically when domain 0 boots / shuts down. +# +# chkconfig: 345 99 00 +# description: Start / stop Xen domains. +# +# This script offers fairly basic functionality. It should work on Redhat +# but also on LSB-compliant SuSE releases and on Debian with the LSB package +# installed. (LSB is the Linux Standard Base) +# +# Based on the example in the "Designing High Quality Integrated Linux +# Applications HOWTO" by Avi Alkalay +# +# +### BEGIN INIT INFO +# Provides: xendomains +# Required-Start: $syslog $remote_fs xenstored xenconsoled +# Should-Start: xend +# Required-Stop: $syslog $remote_fs xenstored xenconsoled +# Should-Stop: xend +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop secondary xen domains +# Description: Start / stop domains automatically when domain 0 +# boots / shuts down. +### END INIT INFO + +. /etc/xen/scripts/hotplugpath.sh + +CMD=3D${SBINDIR}/xl +HEADCOMP=3D"Xen saved domain" +$CMD list &> /dev/null +if test $=3F -ne 0 +then + exit $=3F +fi + +$CMD list &> /dev/null +if test $=3F -ne 0 +then + exit 0; +fi + +# Correct exit code would probably be 5, but it's enough +# if xend complains if we're not running as privileged domain +if ! [ -e /proc/xen/privcmd ]; then + exit 0 +fi + +# See docs/misc/distro_mapping.txt +if [ -d /var/lock/subsys ]; then + LOCKFILE=3D/var/lock/subsys/xendomains +else + LOCKFILE=3D/var/lock/xendomains +fi + +if [ -d /etc/sysconfig ]; then + XENDOM_CONFIG=3D/etc/sysconfig/xendomains +else + XENDOM_CONFIG=3D/etc/default/xendomains +fi + +test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; + if [ "$1" =3D "stop" ]; then exit 0; + else exit 6; fi; } + +. $XENDOM_CONFIG + +# Use the SUSE rc_ init script functions; +# emulate them on LSB, RH and other systems +if test -e /etc/rc.status; then + # SUSE rc script library + . /etc/rc.status +else + _cmd=3D$1 + declare -a _SMSG + if test "${_cmd}" =3D "status"; then + _SMSG=3D(running dead dead unused unknown) + _RC_UNUSED=3D3 + else + _SMSG=3D(done failed failed missed failed skipped unused failed failed) + _RC_UNUSED=3D6 + fi + if test -e /etc/init.d/functions; then + # REDHAT + . /etc/init.d/functions + echo_rc() + { + #echo -n " [${_SMSG[${_RC_RV}]}] " + if test ${_RC_RV} =3D 0; then + success " [${_SMSG[${_RC_RV}]}] " + else + failure " [${_SMSG[${_RC_RV}]}] " + fi + } + elif test -e /lib/lsb/init-functions; then + # LSB + . /lib/lsb/init-functions + if alias log_success_msg >/dev/null 2>/dev/null; then + echo_rc() + { + echo " [${_SMSG[${_RC_RV}]}] " + } + else + echo_rc() + { + if test ${_RC_RV} =3D 0; then + log_success_msg " [${_SMSG[${_RC_RV}]}] " + else + log_failure_msg " [${_SMSG[${_RC_RV}]}] " + fi + } + fi + else + # emulate it + echo_rc() + { + echo " [${_SMSG[${_RC_RV}]}] " + } + fi + rc_reset() { _RC_RV=3D0; } + rc_failed() + { + if test -z "$1"; then + _RC_RV=3D1; + elif test "$1" !=3D "0"; then + _RC_RV=3D$1; + fi + return ${_RC_RV} + } + rc_check() + { + return rc_failed $=3F + } + rc_status() + { + rc_failed $=3F + if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi + if test "$1" =3D "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi + if test "$1" =3D "-u"; then rc_failed ${_RC_UNUSED}; echo_rc; rc_failed 3; shift; fi + if test "$1" =3D "-v"; then echo_rc; shift; fi + if test "$1" =3D "-r"; then _RC_RV=3D0; shift; fi + return ${_RC_RV} + } + rc_exit() { exit ${_RC_RV}; } + rc_active() + { + if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi + if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi + return 1 + } +fi + +if ! which usleep >&/dev/null +then + usleep() + { + if [ -n "$1" ] + then + sleep $(( $1 / 1000000 )) + fi + } +fi + +# Reset status of this service +rc_reset + +## +# Returns 0 (success) if the given parameter names a directory, and that +# directory is not empty. +# +contains_something() +{ + if [ -d "$1" ] && [ `/bin/ls $1 | wc -l` -gt 0 ] + then + return 0 + else + return 1 + fi +} + +# read name from xen config file +rdname() +{ + NM=3D$($CMD create --quiet --dryrun --defconfig "$1" | + sed -n 's/^.*(name \(.*\))$/\1/p;s/^.*"name": "\(.*\)",$/\1/p') +} + +rdnames() +{ + NAMES=3D + if ! contains_something "$XENDOMAINS_AUTO" + then + return + fi + for dom in $XENDOMAINS_AUTO/*; do + rdname $dom + if test -z $NAMES; then + NAMES=3D$NM; + else + NAMES=3D"$NAMES|$NM" + fi + done +} + +LIST_GREP=3D'(domain\|(domid\|(name\|^ {$\|"name":\|"domid":' +parseln() +{ + if [[ "$1" =3D~ '(domain' ]] || [[ "$1" =3D "{" ]]; then + name=3D;id=3D + elif [[ "$1" =3D~ '(name' ]]; then + name=3D$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') + elif [[ "$1" =3D~ '(domid' ]]; then + id=3D$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') + elif [[ "$1" =3D~ '"name":' ]]; then + name=3D$(echo $1 | sed -e 's/^.*"name": "\(.*\)",$/\1/') + elif [[ "$1" =3D~ '"domid":' ]]; then + id=3D$(echo $1 | sed -e 's/^.*"domid": \(.*\),$/\1/') + fi + + [ -n "$name" -a -n "$id" ] && return 0 || return 1 +} + +is_running() +{ + rdname $1 + RC=3D1 + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + case $name in + ($NM) + RC=3D0 + ;; + esac + done < <($CMD list -l | grep "$LIST_GREP") + return $RC +} + +start() +{ + if [ -f $LOCKFILE ]; then + echo -e "xendomains already running (lockfile exists)" + return; + fi + + saved_domains=3D" " + if [ "$XENDOMAINS_RESTORE" =3D "true" ] && + contains_something "$XENDOMAINS_SAVE" + then + mkdir -p $(dirname "$LOCKFILE") + touch $LOCKFILE + echo -n "Restoring Xen domains:" + saved_domains=3D`ls $XENDOMAINS_SAVE` + for dom in $XENDOMAINS_SAVE/*; do + if [ -f $dom ] ; then + HEADER=3D`head -c 16 $dom | head -n 1 2> /dev/null` + if [ "$HEADER" =3D "$HEADCOMP" ]; then + echo -n " ${dom##*/}" + XMR=3D`$CMD restore $dom 2>&1 1>/dev/null` + #$CMD restore $dom + if [ $=3F -ne 0 ]; then + echo -e "\nAn error occurred while restoring domain ${dom##*/}:\n$XMR" + rc_failed $=3F + echo -e '!' + else + # mv $dom ${dom%/*}/.${dom##*/} + rm $dom + fi + fi + fi + done + echo -e + fi + + if contains_something "$XENDOMAINS_AUTO" + then + touch $LOCKFILE + echo -n "Starting auto Xen domains:" + # We expect config scripts for auto starting domains to be in + # XENDOMAINS_AUTO - they could just be symlinks to files elsewhere + + # Create all domains with config files in XENDOMAINS_AUTO. + # TODO: We should record which domain name belongs + # so we have the option to selectively shut down / migrate later + # If a domain statefile from $XENDOMAINS_SAVE matches a domain name + # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't + # restore correctly it requires administrative attention. + for dom in $XENDOMAINS_AUTO/*; do + echo -n " ${dom##*/}" + shortdom=3D$(echo $dom | sed -n 's/^.*\/\(.*\)$/\1/p') + echo $saved_domains | grep -w $shortdom > /dev/null + if [ $=3F -eq 0 ] || is_running $dom; then + echo -n "(skip)" + else + XMC=3D`$CMD create --quiet --defconfig $dom` + if [ $=3F -ne 0 ]; then + echo -e "\nAn error occurred while creating domain ${dom##*/}: $XMC\n" + rc_failed $=3F + echo -e '!' + else + usleep $XENDOMAINS_CREATE_USLEEP + fi + fi + done + fi +} + +all_zombies() +{ + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + if test "$state" !=3D "-b---d" -a "$state" !=3D "-----d"; then + return 1; + fi + done < <($CMD list -l | grep "$LIST_GREP") + return 0 +} + +# Wait for max $XENDOMAINS_STOP_MAXWAIT for $CMD $1 to finish; +# if it has not exited by that time kill it, so the init script will +# succeed within a finite amount of time; if $2 is nonnull, it will +# kill the command as well as soon as no domain (except for zombies) +# are left (used for shutdown --all). Third parameter, if any, suppresses +# output of dots per working state (formatting issues) +watchdog_xencmd() +{ + if test -z "$XENDOMAINS_STOP_MAXWAIT" -o "$XENDOMAINS_STOP_MAXWAIT" =3D "0"; then + exit + fi + + usleep 20000 + for no in `seq 0 $XENDOMAINS_STOP_MAXWAIT`; do + # exit if $CMD save/migrate/shutdown is finished + PSAX=3D`ps axlw | grep "$CMD $1" | grep -v grep` + if test -z "$PSAX"; then exit; fi + if ! test -n "$3"; then echo -n '.'; fi + sleep 1 + # go to kill immediately if there's only zombies left + if all_zombies && test -n "$2"; then break; fi + done + sleep 1 + read PSF PSUID PSPID PSPPID < <(echo "$PSAX") + # kill $CMD $1 + kill $PSPID >/dev/null 2>&1 + + echo -e . +} + +stop() +{ + exec 3>&2 2> /dev/null + + # Collect list of domains to shut down + if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then + rdnames + fi + echo -n "Shutting down Xen domains:" + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + echo -n " $name" + if test "$XENDOMAINS_AUTO_ONLY" =3D "true"; then + eval " + case \"\$name\" in + ($NAMES) + # nothing + ;; + (*) + echo -e '(skip)' + continue + ;; + esac + " + fi + # XENDOMAINS_SYSRQ chould be something like just "s" + # or "s e i u" or even "s e s i u o" + # for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so + if test -n "$XENDOMAINS_SYSRQ"; then + for sysrq in $XENDOMAINS_SYSRQ; do + echo -n "(SR-$sysrq)" + XMR=3D`$CMD sysrq $id $sysrq 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while doing sysrq on domain:\n$XMR\n" + rc_failed $=3F + echo -n '!' + fi + # usleep just ignores empty arg + usleep $XENDOMAINS_USLEEP + done + fi + if test "$state" =3D "-b---d" -o "$state" =3D "-----d"; then + echo -n "(zomb)" + continue + fi + if test -n "$XENDOMAINS_MIGRATE"; then + echo -n "(migr)" + watchdog_xencmd migrate & + WDOG_PID=3D$! + XMR=3D`$CMD migrate $id $XENDOMAINS_MIGRATE 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while migrating domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + + kill $WDOG_PID >/dev/null 2>&1 + else + kill $WDOG_PID >/dev/null 2>&1 + + echo -e . + usleep 1000 + continue + fi + fi + if test -n "$XENDOMAINS_SAVE"; then + echo -n "(save)" + watchdog_xencmd save & + WDOG_PID=3D$! + mkdir -p "$XENDOMAINS_SAVE" + XMR=3D`$CMD save $id $XENDOMAINS_SAVE/$name 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while saving domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + kill $WDOG_PID >/dev/null 2>&1 + else + kill $WDOG_PID >/dev/null 2>&1 + echo -e . + usleep 1000 + continue + fi + fi + if test -n "$XENDOMAINS_SHUTDOWN"; then + # XENDOMAINS_SHUTDOWN should be "--wait" + echo -n "(shut)" + watchdog_xencmd shutdown & + WDOG_PID=3D$! + XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN $id 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while shutting down domain:\n$XMR\n" + rc_failed $=3F + echo -e '!' + fi + kill $WDOG_PID >/dev/null 2>&1 + fi + done < <($CMD list -l | grep "$LIST_GREP") + + # NB. this shuts down ALL Xen domains (politely), not just the ones in + # AUTODIR/* + # This is because it's easier to do ;-) but arguably if this script is run + # on system shutdown then it's also the right thing to do. + if ! all_zombies && test -n "$XENDOMAINS_SHUTDOWN_ALL"; then + # XENDOMAINS_SHUTDOWN_ALL should be "--all --wait" + echo -n " SHUTDOWN_ALL " + watchdog_xencmd shutdown 1 false & + WDOG_PID=3D$! + XMR=3D`$CMD shutdown $XENDOMAINS_SHUTDOWN_ALL 2>&1 1>/dev/null` + if test $=3F -ne 0; then + echo -e "\nAn error occurred while shutting down all domains: $XMR\n" + rc_failed $=3F + echo -e '!' + fi + kill $WDOG_PID >/dev/null 2>&1 + fi + + # Unconditionally delete lock file + rm -f $LOCKFILE + + exec 2>&3 +} + +check_domain_up() +{ + name=3D;id=3D + while read LN; do + parseln "$LN" || continue + if test $id =3D 0; then continue; fi + case $name in + ($1) + return 0 + ;; + esac + done < <($CMD list -l | grep "$LIST_GREP") + return 1 +} + +check_all_auto_domains_up() +{ + if ! contains_something "$XENDOMAINS_AUTO" + then + return 0 + fi + missing=3D + for nm in $XENDOMAINS_AUTO/*; do + rdname $nm + found=3D0 + if check_domain_up "$NM"; then + echo -n " $name" + else + missing=3D"$missing $NM" + fi + done + if test -n "$missing"; then + echo -n " MISS AUTO:$missing" + return 1 + fi + return 0 +} + +check_all_saved_domains_up() +{ + if ! contains_something "$XENDOMAINS_SAVE" + then + return 0 + fi + missing=3D`/bin/ls $XENDOMAINS_SAVE` + echo -n " MISS SAVED: " $missing + return 1 +} + +# This does NOT necessarily restart all running domains: instead it +# stops all running domains and then boots all the domains specified in +# AUTODIR. If other domains have been started manually then they will +# not get restarted. +# Commented out to avoid confusion! + +restart() +{ + stop + start +} + +reload() +{ + restart +} + + +case "$1" in + start) + start + rc_status + if test -f $LOCKFILE; then rc_status -v; fi + ;; + + stop) + stop + rc_status -v + ;; + + restart) + restart + ;; + reload) + reload + ;; + + status) + echo -n "Checking for xendomains:" + if test ! -f $LOCKFILE; then + rc_failed 3 + else + check_all_auto_domains_up + rc_status + check_all_saved_domains_up + rc_status + fi + rc_status -v + ;; + + *) + echo "Usage: $0 {start|stop|restart|reload|status}" + rc_failed 3 + rc_status -v + ;; +esac + +rc_exit -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4814925661014454301== 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 --===============4814925661014454301==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGX-0002yN-Dc; Sat, 05 Jul 2014 16:56:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGV-0002xz-KS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:43 +0000 Content-Length: 1834 Received: from [193.109.254.147:17662] by server-7.bemta-14.messagelabs.com id 5E/39-11169-B4E28B35; Sat, 05 Jul 2014 16:56:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404579401!11029051!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29733 invoked from network); 5 Jul 2014 16:56:42 -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; 5 Jul 2014 16:56:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGT-0006OR-41 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGT-00031e-1X for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:41 +0000 Date: Sat, 05 Jul 2014 16:56:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: force a refresh with autoconf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6718045488676651678==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6718045488676651678== Content-Length: 1430 Content-Transfer-Encoding: quoted-printable commit b1a40efe4a9baa4f740f8c4cf395e0c5d4992830 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:46 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:36 2014 +0100 autoconf: xen: force a refresh with autoconf With some new functionality introduced we can't keep around the old cache, but more specifically at times autogen.sh can produce inconsistent results without considering all files obsolete. The cost of considering all files obsolete is small so just force it. Signed-off-by: Luis R. Rodriguez Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- autogen.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index b5c9688..2be8360 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,12 +1,12 @@ #!/bin/sh -e -autoconf +autoconf -f ( cd tools - autoconf + autoconf -f autoheader ) ( cd stubdom - autoconf + autoconf -f ) ( cd docs - autoconf + autoconf -f ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6718045488676651678== 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 --===============6718045488676651678==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:56: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 1X3TGX-0002yN-Dc; Sat, 05 Jul 2014 16:56:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGV-0002xz-KS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:43 +0000 Content-Length: 1834 Received: from [193.109.254.147:17662] by server-7.bemta-14.messagelabs.com id 5E/39-11169-B4E28B35; Sat, 05 Jul 2014 16:56:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404579401!11029051!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29733 invoked from network); 5 Jul 2014 16:56:42 -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; 5 Jul 2014 16:56:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGT-0006OR-41 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGT-00031e-1X for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:41 +0000 Date: Sat, 05 Jul 2014 16:56:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: force a refresh with autoconf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6718045488676651678==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6718045488676651678== Content-Length: 1430 Content-Transfer-Encoding: quoted-printable commit b1a40efe4a9baa4f740f8c4cf395e0c5d4992830 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:46 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:36 2014 +0100 autoconf: xen: force a refresh with autoconf With some new functionality introduced we can't keep around the old cache, but more specifically at times autogen.sh can produce inconsistent results without considering all files obsolete. The cost of considering all files obsolete is small so just force it. Signed-off-by: Luis R. Rodriguez Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- autogen.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index b5c9688..2be8360 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,12 +1,12 @@ #!/bin/sh -e -autoconf +autoconf -f ( cd tools - autoconf + autoconf -f autoheader ) ( cd stubdom - autoconf + autoconf -f ) ( cd docs - autoconf + autoconf -f ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6718045488676651678== 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 --===============6718045488676651678==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3TGh-00030A-GZ; Sat, 05 Jul 2014 16:56:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGg-0002zw-DG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:54 +0000 Received: from [85.158.139.211:30939] by server-8.bemta-5.messagelabs.com id 78/BE-27672-55E28B35; Sat, 05 Jul 2014 16:56:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404579411!8450061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_23,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2839 invoked from network); 5 Jul 2014 16:56:52 -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; 5 Jul 2014 16:56:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGd-0006Ob-A2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGd-000322-83 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:51 +0000 Date: Sat, 05 Jul 2014 16:56:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: update m4/pkg.m4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3ca69575ea934247cd6b0ccfcb9b5dfd029d5a2 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:47 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:57 2014 +0100 autoconf: update m4/pkg.m4 The provenance of the m4 pkg.m4 macro library was not documented and it was not clear how and if we can update this without breaking things. Document where this comes from, update us to the latest release from git and put a warning about avoiding private evolutions so that instead things go upstream. The pkg-config m4 macro library comes from the upstream pkg-config git repository [0]. If you update the m4 library update this file with provenance and last commit ID information. For documentation on how to use this read the pkg-config(1) man page. Tree: git://anongit.freedesktop.org/pkg-config The last synch was from commit: commit 4f0084d9d3b8726a797a373c7ec5e406000995d0 Author: Dan Nicholson Date: Mon Feb 3 15:59:18 2014 -0800 glib: Fix Makefiles to suppress warnings from automake With the newly added glib.mk, some of the noinst_* variables need to use += in the evaluation to avoid multiple definition warnings from automake. Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez [ ijc -- ran autogen.sh ] --- m4/README.source | 28 +++++++++++++++++ m4/pkg.m4 | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/configure | 45 ++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 8 deletions(-) diff --git a/m4/README.source b/m4/README.source new file mode 100644 index 0000000..8922ea0 --- /dev/null +++ b/m4/README.source @@ -0,0 +1,28 @@ +About +===== +This documents the upstream sources for the different slew of different +m4 sources we have picked up or developed. + +pkg.m4 +====== +The pkg-config m4 macro library comes from the upstream pkg-config +git repository [0]. If you update the m4 library update this file +with provenance and last commit ID information. For documentation +on how to use this read the pkg-config(1) man page. + +Do not modify this file yourself, if you want to evolve it send +patches upstream and then synch back here. + +Tree: git://anongit.freedesktop.org/pkg-config + +The last synch was from commit: + +commit 4f0084d9d3b8726a797a373c7ec5e406000995d0 +Author: Dan Nicholson +Date: Mon Feb 3 15:59:18 2014 -0800 + + glib: Fix Makefiles to suppress warnings from automake + + With the newly added glib.mk, some of the noinst_* variables need to use + += in the evaluation to avoid multiple definition warnings from + automake. diff --git a/m4/pkg.m4 b/m4/pkg.m4 index 9bb3e06..62995f0 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -26,7 +26,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -72,7 +73,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -120,9 +122,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -135,7 +137,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -146,7 +148,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -155,3 +157,77 @@ else $3 fi[]dnl ])# PKG_CHECK_MODULES + + +# PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------- +# Checks for existence of MODULES and gathers its build flags with +# static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +# and VARIABLE-PREFIX_LIBS from --libs. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES_STATIC might not happen, you should be sure to include +# an explicit call to PKG_PROG_PKG_CONFIG in your configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +]) + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR diff --git a/tools/configure b/tools/configure index eebe745..20f1aa9 100755 --- a/tools/configure +++ b/tools/configure @@ -3432,6 +3432,44 @@ esac # PKG_CHECK_MODULES +# PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------- +# Checks for existence of MODULES and gathers its build flags with +# static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +# and VARIABLE-PREFIX_LIBS from --libs. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES_STATIC might not happen, you should be sure to include +# an explicit call to PKG_PROG_PKG_CONFIG in your configure.ac. + + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +# PKG_CHECK_VAR + + # We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS # even though currently we don't set them very separately. @@ -7087,6 +7125,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -7215,6 +7254,7 @@ if test -n "$glib_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7231,6 +7271,7 @@ if test -n "$glib_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7250,9 +7291,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.12" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.12" 2>&1` else - glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.12" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$glib_PKG_ERRORS" >&5 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16: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 1X3TGh-00030A-GZ; Sat, 05 Jul 2014 16:56:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGg-0002zw-DG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:54 +0000 Received: from [85.158.139.211:30939] by server-8.bemta-5.messagelabs.com id 78/BE-27672-55E28B35; Sat, 05 Jul 2014 16:56:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1404579411!8450061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_23,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2839 invoked from network); 5 Jul 2014 16:56:52 -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; 5 Jul 2014 16:56:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGd-0006Ob-A2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGd-000322-83 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:56:51 +0000 Date: Sat, 05 Jul 2014 16:56:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: update m4/pkg.m4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3ca69575ea934247cd6b0ccfcb9b5dfd029d5a2 Author: Luis R. Rodriguez AuthorDate: Thu Jun 12 18:18:47 2014 -0700 Commit: Ian Campbell CommitDate: Wed Jul 2 15:25:57 2014 +0100 autoconf: update m4/pkg.m4 The provenance of the m4 pkg.m4 macro library was not documented and it was not clear how and if we can update this without breaking things. Document where this comes from, update us to the latest release from git and put a warning about avoiding private evolutions so that instead things go upstream. The pkg-config m4 macro library comes from the upstream pkg-config git repository [0]. If you update the m4 library update this file with provenance and last commit ID information. For documentation on how to use this read the pkg-config(1) man page. Tree: git://anongit.freedesktop.org/pkg-config The last synch was from commit: commit 4f0084d9d3b8726a797a373c7ec5e406000995d0 Author: Dan Nicholson Date: Mon Feb 3 15:59:18 2014 -0800 glib: Fix Makefiles to suppress warnings from automake With the newly added glib.mk, some of the noinst_* variables need to use += in the evaluation to avoid multiple definition warnings from automake. Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez [ ijc -- ran autogen.sh ] --- m4/README.source | 28 +++++++++++++++++ m4/pkg.m4 | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/configure | 45 ++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 8 deletions(-) diff --git a/m4/README.source b/m4/README.source new file mode 100644 index 0000000..8922ea0 --- /dev/null +++ b/m4/README.source @@ -0,0 +1,28 @@ +About +===== +This documents the upstream sources for the different slew of different +m4 sources we have picked up or developed. + +pkg.m4 +====== +The pkg-config m4 macro library comes from the upstream pkg-config +git repository [0]. If you update the m4 library update this file +with provenance and last commit ID information. For documentation +on how to use this read the pkg-config(1) man page. + +Do not modify this file yourself, if you want to evolve it send +patches upstream and then synch back here. + +Tree: git://anongit.freedesktop.org/pkg-config + +The last synch was from commit: + +commit 4f0084d9d3b8726a797a373c7ec5e406000995d0 +Author: Dan Nicholson +Date: Mon Feb 3 15:59:18 2014 -0800 + + glib: Fix Makefiles to suppress warnings from automake + + With the newly added glib.mk, some of the noinst_* variables need to use + += in the evaluation to avoid multiple definition warnings from + automake. diff --git a/m4/pkg.m4 b/m4/pkg.m4 index 9bb3e06..62995f0 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -26,7 +26,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -72,7 +73,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -120,9 +122,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -135,7 +137,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -146,7 +148,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -155,3 +157,77 @@ else $3 fi[]dnl ])# PKG_CHECK_MODULES + + +# PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------- +# Checks for existence of MODULES and gathers its build flags with +# static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +# and VARIABLE-PREFIX_LIBS from --libs. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES_STATIC might not happen, you should be sure to include +# an explicit call to PKG_PROG_PKG_CONFIG in your configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +]) + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR diff --git a/tools/configure b/tools/configure index eebe745..20f1aa9 100755 --- a/tools/configure +++ b/tools/configure @@ -3432,6 +3432,44 @@ esac # PKG_CHECK_MODULES +# PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------- +# Checks for existence of MODULES and gathers its build flags with +# static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +# and VARIABLE-PREFIX_LIBS from --libs. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES_STATIC might not happen, you should be sure to include +# an explicit call to PKG_PROG_PKG_CONFIG in your configure.ac. + + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +# PKG_CHECK_VAR + + # We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS # even though currently we don't set them very separately. @@ -7087,6 +7125,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -7215,6 +7254,7 @@ if test -n "$glib_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7231,6 +7271,7 @@ if test -n "$glib_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7250,9 +7291,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.12" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.12" 2>&1` else - glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.12" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$glib_PKG_ERRORS" >&5 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3TGr-00031l-JM; Sat, 05 Jul 2014 16:57:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGq-00031T-Ei for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:04 +0000 Content-Length: 5373 Received: from [85.158.139.211:31272] by server-16.bemta-5.messagelabs.com id CD/3A-18862-F5E28B35; Sat, 05 Jul 2014 16:57:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404579421!13815007!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9275 invoked from network); 5 Jul 2014 16:57:02 -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; 5 Jul 2014 16:57:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGn-0006Ok-O0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGn-00032a-Dj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:01 +0000 Date: Sat, 05 Jul 2014 16:57:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add support for FreeBSD uuid implementation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4546672703093913347==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4546672703093913347== Content-Length: 5093 Content-Transfer-Encoding: quoted-printable commit 18b102a93341cd6c29ca97bcebbd19d3ae697771 Author: Roger Pau Monne AuthorDate: Fri Jun 27 16:06:28 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 2 15:53:12 2014 +0100 libxl: add support for FreeBSD uuid implementation Add the FreeBSD specific uuid implementation. Since uuid_t is not defined as an array, but as a struct on FreeBSD, use a union with a array in order to be able to return the uuid as a bytearray. Also, added a libxl internal compile time assert macro, that is used to assert that the size of uuid_t is the same as the union used in libxl. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 9 +++++++++ tools/libxl/libxl_uuid.c | 40 ++++++++++++++++++++++++++++++++-------- tools/libxl/libxl_uuid.h | 12 +++++++----- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2eea557..e8f2abb 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3184,6 +3184,15 @@ int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); +/* + * Compile time assertion + */ +#if __GNUC__ > 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ >=3D 6) +#define BUILD_BUG_ON(p) ({ _Static_assert(!(p), "!(" #p ")"); }) +#else +#define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) +#endif + #endif /* diff --git a/tools/libxl/libxl_uuid.c b/tools/libxl/libxl_uuid.c index 172b7d1..7d4a032 100644 --- a/tools/libxl/libxl_uuid.c +++ b/tools/libxl/libxl_uuid.c @@ -59,21 +59,35 @@ uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid) return uuid->uuid; } -#elif defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) int libxl_uuid_is_nil(const libxl_uuid *uuid) { uint32_t status; - return uuid_is_nil((uuid_t *)uuid->uuid, &status); + + return uuid_is_nil(&uuid->uuid, &status); } void libxl_uuid_generate(libxl_uuid *uuid) { uint32_t status; - uuid_create((uuid_t *)uuid->uuid, &status); + + BUILD_BUG_ON(sizeof(libxl_uuid) !=3D sizeof(uuid_t)); + uuid_create(&uuid->uuid, &status); assert(status =3D=3D uuid_s_ok); } +#ifdef __FreeBSD__ +int libxl_uuid_from_string(libxl_uuid *uuid, const char *in) +{ + uint32_t status; + + uuid_from_string(in, &uuid->uuid, &status); + if (status !=3D uuid_s_ok) + return -1; + return 0; +} +#else #define LIBXL__UUID_PTRS(uuid) &uuid[0], &uuid[1], &uuid[2], &uuid[3], \ &uuid[4], &uuid[5], &uuid[6], &uuid[7], \ &uuid[8], &uuid[9], &uuid[10],&uuid[11], \ @@ -85,33 +99,43 @@ int libxl_uuid_from_string(libxl_uuid *uuid, const char *in) return 0; } #undef LIBXL__UUID_PTRS +#endif void libxl_uuid_copy(libxl_ctx *ctx_opt, libxl_uuid *dst, const libxl_uuid *src) { - memcpy(dst->uuid, src->uuid, sizeof(dst->uuid)); + memcpy(&dst->uuid, &src->uuid, sizeof(dst->uuid)); } void libxl_uuid_clear(libxl_uuid *uuid) { - memset(uuid->uuid, 0, sizeof(uuid->uuid)); + memset(&uuid->uuid, 0, sizeof(uuid->uuid)); } +#ifdef __FreeBSD__ +int libxl_uuid_compare(const libxl_uuid *uuid1, const libxl_uuid *uuid2) +{ + + return uuid_compare(&uuid1->uuid, &uuid2->uuid, NULL); +} +#else int libxl_uuid_compare(const libxl_uuid *uuid1, const libxl_uuid *uuid2) { return memcmp(uuid1->uuid, uuid2->uuid, sizeof(uuid1->uuid)); } +#endif const uint8_t *libxl_uuid_bytearray_const(const libxl_uuid *uuid) { - return uuid->uuid; + + return uuid->uuid_raw; } uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid) { - return uuid->uuid; -} + return uuid->uuid_raw; +} #else #error "Please update libxl_uuid.c for your OS" diff --git a/tools/libxl/libxl_uuid.h b/tools/libxl/libxl_uuid.h index 0c2a1e7..196b5bc 100644 --- a/tools/libxl/libxl_uuid.h +++ b/tools/libxl/libxl_uuid.h @@ -33,20 +33,22 @@ typedef struct { #define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(((uint8_t *)arg.uuid)) -#elif defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) #include +#include #include #include #include #include -#define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(arg.uuid) - -typedef struct { - uint8_t uuid[16]; +typedef union { + uuid_t uuid; + uint8_t uuid_raw[16]; } libxl_uuid; +#define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(arg.uuid_raw) + #else #error "Please update libxl_uuid.h for your OS" -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4546672703093913347== 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 --===============4546672703093913347==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:57:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3TGr-00031l-JM; Sat, 05 Jul 2014 16:57:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGq-00031T-Ei for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:04 +0000 Content-Length: 5373 Received: from [85.158.139.211:31272] by server-16.bemta-5.messagelabs.com id CD/3A-18862-F5E28B35; Sat, 05 Jul 2014 16:57:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1404579421!13815007!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9275 invoked from network); 5 Jul 2014 16:57:02 -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; 5 Jul 2014 16:57:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGn-0006Ok-O0 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGn-00032a-Dj for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:01 +0000 Date: Sat, 05 Jul 2014 16:57:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add support for FreeBSD uuid implementation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4546672703093913347==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4546672703093913347== Content-Length: 5093 Content-Transfer-Encoding: quoted-printable commit 18b102a93341cd6c29ca97bcebbd19d3ae697771 Author: Roger Pau Monne AuthorDate: Fri Jun 27 16:06:28 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 2 15:53:12 2014 +0100 libxl: add support for FreeBSD uuid implementation Add the FreeBSD specific uuid implementation. Since uuid_t is not defined as an array, but as a struct on FreeBSD, use a union with a array in order to be able to return the uuid as a bytearray. Also, added a libxl internal compile time assert macro, that is used to assert that the size of uuid_t is the same as the union used in libxl. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 9 +++++++++ tools/libxl/libxl_uuid.c | 40 ++++++++++++++++++++++++++++++++-------- tools/libxl/libxl_uuid.h | 12 +++++++----- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2eea557..e8f2abb 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3184,6 +3184,15 @@ int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); +/* + * Compile time assertion + */ +#if __GNUC__ > 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ >=3D 6) +#define BUILD_BUG_ON(p) ({ _Static_assert(!(p), "!(" #p ")"); }) +#else +#define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) +#endif + #endif /* diff --git a/tools/libxl/libxl_uuid.c b/tools/libxl/libxl_uuid.c index 172b7d1..7d4a032 100644 --- a/tools/libxl/libxl_uuid.c +++ b/tools/libxl/libxl_uuid.c @@ -59,21 +59,35 @@ uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid) return uuid->uuid; } -#elif defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) int libxl_uuid_is_nil(const libxl_uuid *uuid) { uint32_t status; - return uuid_is_nil((uuid_t *)uuid->uuid, &status); + + return uuid_is_nil(&uuid->uuid, &status); } void libxl_uuid_generate(libxl_uuid *uuid) { uint32_t status; - uuid_create((uuid_t *)uuid->uuid, &status); + + BUILD_BUG_ON(sizeof(libxl_uuid) !=3D sizeof(uuid_t)); + uuid_create(&uuid->uuid, &status); assert(status =3D=3D uuid_s_ok); } +#ifdef __FreeBSD__ +int libxl_uuid_from_string(libxl_uuid *uuid, const char *in) +{ + uint32_t status; + + uuid_from_string(in, &uuid->uuid, &status); + if (status !=3D uuid_s_ok) + return -1; + return 0; +} +#else #define LIBXL__UUID_PTRS(uuid) &uuid[0], &uuid[1], &uuid[2], &uuid[3], \ &uuid[4], &uuid[5], &uuid[6], &uuid[7], \ &uuid[8], &uuid[9], &uuid[10],&uuid[11], \ @@ -85,33 +99,43 @@ int libxl_uuid_from_string(libxl_uuid *uuid, const char *in) return 0; } #undef LIBXL__UUID_PTRS +#endif void libxl_uuid_copy(libxl_ctx *ctx_opt, libxl_uuid *dst, const libxl_uuid *src) { - memcpy(dst->uuid, src->uuid, sizeof(dst->uuid)); + memcpy(&dst->uuid, &src->uuid, sizeof(dst->uuid)); } void libxl_uuid_clear(libxl_uuid *uuid) { - memset(uuid->uuid, 0, sizeof(uuid->uuid)); + memset(&uuid->uuid, 0, sizeof(uuid->uuid)); } +#ifdef __FreeBSD__ +int libxl_uuid_compare(const libxl_uuid *uuid1, const libxl_uuid *uuid2) +{ + + return uuid_compare(&uuid1->uuid, &uuid2->uuid, NULL); +} +#else int libxl_uuid_compare(const libxl_uuid *uuid1, const libxl_uuid *uuid2) { return memcmp(uuid1->uuid, uuid2->uuid, sizeof(uuid1->uuid)); } +#endif const uint8_t *libxl_uuid_bytearray_const(const libxl_uuid *uuid) { - return uuid->uuid; + + return uuid->uuid_raw; } uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid) { - return uuid->uuid; -} + return uuid->uuid_raw; +} #else #error "Please update libxl_uuid.c for your OS" diff --git a/tools/libxl/libxl_uuid.h b/tools/libxl/libxl_uuid.h index 0c2a1e7..196b5bc 100644 --- a/tools/libxl/libxl_uuid.h +++ b/tools/libxl/libxl_uuid.h @@ -33,20 +33,22 @@ typedef struct { #define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(((uint8_t *)arg.uuid)) -#elif defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) #include +#include #include #include #include #include -#define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(arg.uuid) - -typedef struct { - uint8_t uuid[16]; +typedef union { + uuid_t uuid; + uint8_t uuid_raw[16]; } libxl_uuid; +#define LIBXL_UUID_BYTES(arg) LIBXL__UUID_BYTES(arg.uuid_raw) + #else #error "Please update libxl_uuid.h for your OS" -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4546672703093913347== 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 --===============4546672703093913347==-- From xen-changelog-bounces@lists.xen.org Sat Jul 05 16:57:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH3-00033V-MI; Sat, 05 Jul 2014 16:57:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH2-00033L-II for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:16 +0000 Received: from [85.158.137.68:17897] by server-12.bemta-3.messagelabs.com id A1/A4-12714-B6E28B35; Sat, 05 Jul 2014 16:57:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1404579432!14232335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9189 invoked from network); 5 Jul 2014 16:57:13 -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 Jul 2014 16:57:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGx-0006PJ-Vr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGx-00033h-RJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:11 +0000 Date: Sat, 05 Jul 2014 16:57:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: remove old remus script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b66f84e37a45038f9e5dae7a5768a5525d1e6ba Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:12 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:10 2014 +0100 remus: remove old remus script Since xend already deleted, the old remus script which based on xend no longer functional, remove it. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson [ ijc -- removed "SUBDIR-y += remus" from tools/Makefile ] --- tools/Makefile | 1 - tools/remus/Makefile | 15 --- tools/remus/remus | 230 -------------------------------------------------- 3 files changed, 0 insertions(+), 246 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 4682f43..f4aa200 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -30,7 +30,6 @@ endif SUBDIRS-y += xenpmd SUBDIRS-y += libxl -SUBDIRS-y += remus SUBDIRS-$(CONFIG_X86) += xenpaging SUBDIRS-$(CONFIG_X86) += debugger/gdbsx SUBDIRS-$(CONFIG_X86) += debugger/kdd diff --git a/tools/remus/Makefile b/tools/remus/Makefile deleted file mode 100644 index ae82376..0000000 --- a/tools/remus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -XEN_ROOT=$(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SCRIPTS = remus - -.PHONY: all -all: subdirs-all - -.PHONY: install -install: subdirs-install - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: subdirs-clean diff --git a/tools/remus/remus b/tools/remus/remus deleted file mode 100644 index 38f0365..0000000 --- a/tools/remus/remus +++ /dev/null @@ -1,230 +0,0 @@ -#!/usr/bin/env python -# -# This is a save process which also buffers outgoing I/O between -# rounds, so that external viewers never see anything that hasn't -# been committed at the backup -# -# TODO: fencing. - -import optparse, os, re, select, signal, sys, time - -from xen.remus import save, util, vm -from xen.remus.device import ReplicatedDisk, ReplicatedDiskException -from xen.remus.device import BufferedNIC, BufferedNICException -from xen.xend import XendOptions - -class CfgException(Exception): pass - -class Cfg(object): - - REMUS_FLAGS_COMPRESSION = 1 - - def __init__(self): - # must be set - self.domid = 0 - - self.host = 'localhost' - self.nullremus = False - self.port = XendOptions.instance().get_xend_relocation_port() - self.interval = 200 - self.netbuffer = True - self.flags = self.REMUS_FLAGS_COMPRESSION - self.timer = False - - parser = optparse.OptionParser() - parser.usage = '%prog [options] domain [destination]' - parser.add_option('-i', '--interval', dest='interval', type='int', - metavar='MS', - help='checkpoint every MS milliseconds') - parser.add_option('-p', '--port', dest='port', type='int', - help='send stream to port PORT', metavar='PORT') - parser.add_option('', '--blackhole', dest='nullremus', action='store_true', - help='replicate to /dev/null (no disk checkpoints, only memory & net buffering)') - parser.add_option('', '--no-net', dest='nonet', action='store_true', - help='run without net buffering (benchmark option)') - parser.add_option('', '--no-compression', dest='nocompress', action='store_true', - help='run without checkpoint compression') - parser.add_option('', '--timer', dest='timer', action='store_true', - help='force pause at checkpoint interval (experimental)') - self.parser = parser - - def usage(self): - self.parser.print_help() - - def getargs(self): - opts, args = self.parser.parse_args() - - if opts.interval: - self.interval = opts.interval - if opts.port: - self.port = opts.port - if opts.nullremus: - self.nullremus = True - if opts.nonet: - self.netbuffer = False - if opts.nocompress: - self.flags &= ~self.REMUS_FLAGS_COMPRESSION - if opts.timer: - self.timer = True - - if not args: - raise CfgException('Missing domain') - self.domid = args[0] - if (len(args) > 1): - self.host = args[1] - -class SignalException(Exception): pass - -def run(cfg): - closure = lambda: None - closure.cmd = None - - def sigexception(signo, frame): - raise SignalException(signo) - - def die(): - # I am not sure what the best way to die is. xm destroy is another option, - # or we could attempt to trigger some instant reboot. - print "dying..." - print util.runcmd(['sudo', 'ifdown', 'eth2']) - # dangling imq0 handle on vif locks up the system - for buf in bufs: - buf.uninstall() - print util.runcmd(['sudo', 'xm', 'destroy', cfg.domid]) - print util.runcmd(['sudo', 'ifup', 'eth2']) - - def getcommand(): - """Get a command to execute while running. - Commands include: - s: die prior to postsuspend hook - s2: die after postsuspend hook - r: die prior to preresume hook - r2: die after preresume hook - c: die prior to commit hook - c2: die after commit hook - """ - r, w, x = select.select([sys.stdin], [], [], 0) - if sys.stdin not in r: - return - - cmd = sys.stdin.readline().strip() - if cmd not in ('s', 's2', 'r', 'r2', 'c', 'c2'): - print "unknown command: %s" % cmd - closure.cmd = cmd - - signal.signal(signal.SIGTERM, sigexception) - - dom = vm.VM(cfg.domid) - - # set up I/O buffers - bufs = [] - - # disks must commit before network can be released - if not cfg.nullremus: - for disk in dom.disks: - try: - bufs.append(ReplicatedDisk(disk)) - except ReplicatedDiskException, e: - print e - continue - - if cfg.netbuffer: - for vif in dom.vifs: - bufs.append(BufferedNIC(vif)) - - if cfg.nullremus: - fd = save.NullSocket((cfg.host, cfg.port)) - else: - fd = save.MigrationSocket((cfg.host, cfg.port)) - - def postsuspend(): - 'Begin external checkpointing after domain has paused' - if not cfg.timer: - # when not using a timer thread, sleep until now + interval - closure.starttime = time.time() - - if closure.cmd == 's': - die() - - for buf in bufs: - buf.postsuspend() - - if closure.cmd == 's2': - die() - - def preresume(): - 'Complete external checkpointing before domain resumes' - if closure.cmd == 'r': - die() - - for buf in bufs: - buf.preresume() - - if closure.cmd == 'r2': - die() - - def commit(): - 'commit network buffer' - if closure.cmd == 'c': - die() - - print >> sys.stderr, "PROF: flushed memory at %0.6f" % (time.time()) - - for buf in bufs: - buf.commit() - - if closure.cmd == 'c2': - die() - - # Since the domain is running at this point, it's a good time to - # check for control channel commands - getcommand() - - if not cfg.timer: - endtime = time.time() - elapsed = (endtime - closure.starttime) * 1000 - - if elapsed < cfg.interval: - time.sleep((cfg.interval - elapsed) / 1000.0) - - # False ends checkpointing - return True - - if cfg.timer: - interval = cfg.interval - else: - interval = 0 - - rc = 0 - - checkpointer = save.Saver(cfg.domid, fd, postsuspend, preresume, commit, - interval, cfg.flags) - - try: - checkpointer.start() - except save.CheckpointError, e: - print e - rc = 1 - except KeyboardInterrupt: - pass - except SignalException: - print '*** signalled ***' - - for buf in bufs: - buf.uninstall() - - sys.exit(rc) - -cfg = Cfg() -try: - cfg.getargs() -except CfgException, inst: - print str(inst) - cfg.usage() - sys.exit(1) - -try: - run(cfg) -except vm.VMException, inst: - print str(inst) - sys.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 Jul 05 16:57:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH3-00033V-MI; Sat, 05 Jul 2014 16:57:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH2-00033L-II for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:16 +0000 Received: from [85.158.137.68:17897] by server-12.bemta-3.messagelabs.com id A1/A4-12714-B6E28B35; Sat, 05 Jul 2014 16:57:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1404579432!14232335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9189 invoked from network); 5 Jul 2014 16:57:13 -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 Jul 2014 16:57:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TGx-0006PJ-Vr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TGx-00033h-RJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:11 +0000 Date: Sat, 05 Jul 2014 16:57:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: remove old remus script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b66f84e37a45038f9e5dae7a5768a5525d1e6ba Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:12 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:10 2014 +0100 remus: remove old remus script Since xend already deleted, the old remus script which based on xend no longer functional, remove it. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson [ ijc -- removed "SUBDIR-y += remus" from tools/Makefile ] --- tools/Makefile | 1 - tools/remus/Makefile | 15 --- tools/remus/remus | 230 -------------------------------------------------- 3 files changed, 0 insertions(+), 246 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 4682f43..f4aa200 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -30,7 +30,6 @@ endif SUBDIRS-y += xenpmd SUBDIRS-y += libxl -SUBDIRS-y += remus SUBDIRS-$(CONFIG_X86) += xenpaging SUBDIRS-$(CONFIG_X86) += debugger/gdbsx SUBDIRS-$(CONFIG_X86) += debugger/kdd diff --git a/tools/remus/Makefile b/tools/remus/Makefile deleted file mode 100644 index ae82376..0000000 --- a/tools/remus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -XEN_ROOT=$(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SCRIPTS = remus - -.PHONY: all -all: subdirs-all - -.PHONY: install -install: subdirs-install - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: subdirs-clean diff --git a/tools/remus/remus b/tools/remus/remus deleted file mode 100644 index 38f0365..0000000 --- a/tools/remus/remus +++ /dev/null @@ -1,230 +0,0 @@ -#!/usr/bin/env python -# -# This is a save process which also buffers outgoing I/O between -# rounds, so that external viewers never see anything that hasn't -# been committed at the backup -# -# TODO: fencing. - -import optparse, os, re, select, signal, sys, time - -from xen.remus import save, util, vm -from xen.remus.device import ReplicatedDisk, ReplicatedDiskException -from xen.remus.device import BufferedNIC, BufferedNICException -from xen.xend import XendOptions - -class CfgException(Exception): pass - -class Cfg(object): - - REMUS_FLAGS_COMPRESSION = 1 - - def __init__(self): - # must be set - self.domid = 0 - - self.host = 'localhost' - self.nullremus = False - self.port = XendOptions.instance().get_xend_relocation_port() - self.interval = 200 - self.netbuffer = True - self.flags = self.REMUS_FLAGS_COMPRESSION - self.timer = False - - parser = optparse.OptionParser() - parser.usage = '%prog [options] domain [destination]' - parser.add_option('-i', '--interval', dest='interval', type='int', - metavar='MS', - help='checkpoint every MS milliseconds') - parser.add_option('-p', '--port', dest='port', type='int', - help='send stream to port PORT', metavar='PORT') - parser.add_option('', '--blackhole', dest='nullremus', action='store_true', - help='replicate to /dev/null (no disk checkpoints, only memory & net buffering)') - parser.add_option('', '--no-net', dest='nonet', action='store_true', - help='run without net buffering (benchmark option)') - parser.add_option('', '--no-compression', dest='nocompress', action='store_true', - help='run without checkpoint compression') - parser.add_option('', '--timer', dest='timer', action='store_true', - help='force pause at checkpoint interval (experimental)') - self.parser = parser - - def usage(self): - self.parser.print_help() - - def getargs(self): - opts, args = self.parser.parse_args() - - if opts.interval: - self.interval = opts.interval - if opts.port: - self.port = opts.port - if opts.nullremus: - self.nullremus = True - if opts.nonet: - self.netbuffer = False - if opts.nocompress: - self.flags &= ~self.REMUS_FLAGS_COMPRESSION - if opts.timer: - self.timer = True - - if not args: - raise CfgException('Missing domain') - self.domid = args[0] - if (len(args) > 1): - self.host = args[1] - -class SignalException(Exception): pass - -def run(cfg): - closure = lambda: None - closure.cmd = None - - def sigexception(signo, frame): - raise SignalException(signo) - - def die(): - # I am not sure what the best way to die is. xm destroy is another option, - # or we could attempt to trigger some instant reboot. - print "dying..." - print util.runcmd(['sudo', 'ifdown', 'eth2']) - # dangling imq0 handle on vif locks up the system - for buf in bufs: - buf.uninstall() - print util.runcmd(['sudo', 'xm', 'destroy', cfg.domid]) - print util.runcmd(['sudo', 'ifup', 'eth2']) - - def getcommand(): - """Get a command to execute while running. - Commands include: - s: die prior to postsuspend hook - s2: die after postsuspend hook - r: die prior to preresume hook - r2: die after preresume hook - c: die prior to commit hook - c2: die after commit hook - """ - r, w, x = select.select([sys.stdin], [], [], 0) - if sys.stdin not in r: - return - - cmd = sys.stdin.readline().strip() - if cmd not in ('s', 's2', 'r', 'r2', 'c', 'c2'): - print "unknown command: %s" % cmd - closure.cmd = cmd - - signal.signal(signal.SIGTERM, sigexception) - - dom = vm.VM(cfg.domid) - - # set up I/O buffers - bufs = [] - - # disks must commit before network can be released - if not cfg.nullremus: - for disk in dom.disks: - try: - bufs.append(ReplicatedDisk(disk)) - except ReplicatedDiskException, e: - print e - continue - - if cfg.netbuffer: - for vif in dom.vifs: - bufs.append(BufferedNIC(vif)) - - if cfg.nullremus: - fd = save.NullSocket((cfg.host, cfg.port)) - else: - fd = save.MigrationSocket((cfg.host, cfg.port)) - - def postsuspend(): - 'Begin external checkpointing after domain has paused' - if not cfg.timer: - # when not using a timer thread, sleep until now + interval - closure.starttime = time.time() - - if closure.cmd == 's': - die() - - for buf in bufs: - buf.postsuspend() - - if closure.cmd == 's2': - die() - - def preresume(): - 'Complete external checkpointing before domain resumes' - if closure.cmd == 'r': - die() - - for buf in bufs: - buf.preresume() - - if closure.cmd == 'r2': - die() - - def commit(): - 'commit network buffer' - if closure.cmd == 'c': - die() - - print >> sys.stderr, "PROF: flushed memory at %0.6f" % (time.time()) - - for buf in bufs: - buf.commit() - - if closure.cmd == 'c2': - die() - - # Since the domain is running at this point, it's a good time to - # check for control channel commands - getcommand() - - if not cfg.timer: - endtime = time.time() - elapsed = (endtime - closure.starttime) * 1000 - - if elapsed < cfg.interval: - time.sleep((cfg.interval - elapsed) / 1000.0) - - # False ends checkpointing - return True - - if cfg.timer: - interval = cfg.interval - else: - interval = 0 - - rc = 0 - - checkpointer = save.Saver(cfg.domid, fd, postsuspend, preresume, commit, - interval, cfg.flags) - - try: - checkpointer.start() - except save.CheckpointError, e: - print e - rc = 1 - except KeyboardInterrupt: - pass - except SignalException: - print '*** signalled ***' - - for buf in bufs: - buf.uninstall() - - sys.exit(rc) - -cfg = Cfg() -try: - cfg.getargs() -except CfgException, inst: - print str(inst) - cfg.usage() - sys.exit(1) - -try: - run(cfg) -except vm.VMException, inst: - print str(inst) - sys.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 Jul 05 16:57:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THB-000354-R7; Sat, 05 Jul 2014 16:57:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THA-00034r-LT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:24 +0000 Received: from [193.109.254.147:24590] by server-4.bemta-14.messagelabs.com id D9/E8-20586-47E28B35; Sat, 05 Jul 2014 16:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1404579442!15655457!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 896 invoked from network); 5 Jul 2014 16:57:23 -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; 5 Jul 2014 16:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH8-0006PN-40 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TH8-00034B-2v for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:22 +0000 Date: Sat, 05 Jul 2014 16:57:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: move remus README to docs directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20857ac13fd3ee6c5cbbb4bad4b2c6c2bde93d37 Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:13 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:28 2014 +0100 remus: move remus README to docs directory We do not need a separate directory to store remus README, just move it to docs/ directory. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- docs/README.remus | 4 ++++ tools/remus/README | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.remus b/docs/README.remus new file mode 100644 index 0000000..9e8140b --- /dev/null +++ b/docs/README.remus @@ -0,0 +1,4 @@ +Remus provides fault tolerance for virtual machines by sending continuous +checkpoints to a backup, which will activate if the target VM fails. + +See the website at http://nss.cs.ubc.ca/remus/ for details. diff --git a/tools/remus/README b/tools/remus/README deleted file mode 100644 index 9e8140b..0000000 --- a/tools/remus/README +++ /dev/null @@ -1,4 +0,0 @@ -Remus provides fault tolerance for virtual machines by sending continuous -checkpoints to a backup, which will activate if the target VM fails. - -See the website at http://nss.cs.ubc.ca/remus/ for details. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THB-000354-R7; Sat, 05 Jul 2014 16:57:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THA-00034r-LT for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:24 +0000 Received: from [193.109.254.147:24590] by server-4.bemta-14.messagelabs.com id D9/E8-20586-47E28B35; Sat, 05 Jul 2014 16:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1404579442!15655457!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 896 invoked from network); 5 Jul 2014 16:57:23 -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; 5 Jul 2014 16:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TH8-0006PN-40 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TH8-00034B-2v for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:22 +0000 Date: Sat, 05 Jul 2014 16:57:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: move remus README to docs directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20857ac13fd3ee6c5cbbb4bad4b2c6c2bde93d37 Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:13 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:28 2014 +0100 remus: move remus README to docs directory We do not need a separate directory to store remus README, just move it to docs/ directory. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- docs/README.remus | 4 ++++ tools/remus/README | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.remus b/docs/README.remus new file mode 100644 index 0000000..9e8140b --- /dev/null +++ b/docs/README.remus @@ -0,0 +1,4 @@ +Remus provides fault tolerance for virtual machines by sending continuous +checkpoints to a backup, which will activate if the target VM fails. + +See the website at http://nss.cs.ubc.ca/remus/ for details. diff --git a/tools/remus/README b/tools/remus/README deleted file mode 100644 index 9e8140b..0000000 --- a/tools/remus/README +++ /dev/null @@ -1,4 +0,0 @@ -Remus provides fault tolerance for virtual machines by sending continuous -checkpoints to a backup, which will activate if the target VM fails. - -See the website at http://nss.cs.ubc.ca/remus/ for details. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THM-00036w-UH; Sat, 05 Jul 2014 16:57:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THK-00036W-Ss for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:34 +0000 Received: from [85.158.137.68:18353] by server-3.bemta-3.messagelabs.com id FA/7E-25808-E7E28B35; Sat, 05 Jul 2014 16:57:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1404579452!14106453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4760 invoked from network); 5 Jul 2014 16:57:33 -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 Jul 2014 16:57:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THI-0006PX-8G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THI-00034Y-7B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:32 +0000 Date: Sat, 05 Jul 2014 16:57:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: add wikipage link to remus 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 ebc977747bfa3db01c5342be94d623c0629f724a Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:14 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 remus: add wikipage link to remus README http://nss.cs.ubc.ca/remus/ does not exists, replace it with Remus wikipage. Signed-off-by: Yang Hongyang Acked-by: Ian Jackson Acked-by: Shriram Rajagopalan --- docs/README.remus | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/README.remus b/docs/README.remus index 9e8140b..9fa00fe 100644 --- a/docs/README.remus +++ b/docs/README.remus @@ -1,4 +1,4 @@ Remus provides fault tolerance for virtual machines by sending continuous checkpoints to a backup, which will activate if the target VM fails. -See the website at http://nss.cs.ubc.ca/remus/ for details. +See the website at http://wiki.xen.org/wiki/Remus for details. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THM-00036w-UH; Sat, 05 Jul 2014 16:57:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THK-00036W-Ss for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:34 +0000 Received: from [85.158.137.68:18353] by server-3.bemta-3.messagelabs.com id FA/7E-25808-E7E28B35; Sat, 05 Jul 2014 16:57:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1404579452!14106453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4760 invoked from network); 5 Jul 2014 16:57:33 -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 Jul 2014 16:57:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THI-0006PX-8G for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THI-00034Y-7B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:32 +0000 Date: Sat, 05 Jul 2014 16:57:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: add wikipage link to remus 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 ebc977747bfa3db01c5342be94d623c0629f724a Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:14 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 remus: add wikipage link to remus README http://nss.cs.ubc.ca/remus/ does not exists, replace it with Remus wikipage. Signed-off-by: Yang Hongyang Acked-by: Ian Jackson Acked-by: Shriram Rajagopalan --- docs/README.remus | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/README.remus b/docs/README.remus index 9e8140b..9fa00fe 100644 --- a/docs/README.remus +++ b/docs/README.remus @@ -1,4 +1,4 @@ Remus provides fault tolerance for virtual machines by sending continuous checkpoints to a backup, which will activate if the target VM fails. -See the website at http://nss.cs.ubc.ca/remus/ for details. +See the website at http://wiki.xen.org/wiki/Remus for details. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THY-00038d-0p; Sat, 05 Jul 2014 16:57:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THW-00038S-Lg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:46 +0000 Received: from [85.158.139.211:35205] by server-11.bemta-5.messagelabs.com id F5/71-01425-98E28B35; Sat, 05 Jul 2014 16:57:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1404579462!10492979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15874 invoked from network); 5 Jul 2014 16:57:43 -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; 5 Jul 2014 16:57:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THS-0006Pd-D4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THS-000350-BU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:42 +0000 Date: Sat, 05 Jul 2014 16:57:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Update maintained files of REMUS 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 1c75b51156c1ee78d209e6bac670531f75a3ca14 Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:15 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 MAINTAINERS: Update maintained files of REMUS part delete tools/remus and add docs/README.remus Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1865a84..ae5d7b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -258,7 +258,7 @@ T: git git://xenbits.xen.org/qemu-upstream-*.git REMUS M: Shriram Rajagopalan S: Maintained -F: tools/remus/ +F: docs/README.remus F: tools/blktap2/drivers/block-remus.c F: tools/blktap2/drivers/hashtable* -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THY-00038d-0p; Sat, 05 Jul 2014 16:57:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THW-00038S-Lg for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:46 +0000 Received: from [85.158.139.211:35205] by server-11.bemta-5.messagelabs.com id F5/71-01425-98E28B35; Sat, 05 Jul 2014 16:57:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1404579462!10492979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15874 invoked from network); 5 Jul 2014 16:57:43 -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; 5 Jul 2014 16:57:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THS-0006Pd-D4 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THS-000350-BU for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:42 +0000 Date: Sat, 05 Jul 2014 16:57:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Update maintained files of REMUS 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 1c75b51156c1ee78d209e6bac670531f75a3ca14 Author: Yang Hongyang AuthorDate: Wed Jun 25 15:26:15 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 MAINTAINERS: Update maintained files of REMUS part delete tools/remus and add docs/README.remus Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1865a84..ae5d7b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -258,7 +258,7 @@ T: git git://xenbits.xen.org/qemu-upstream-*.git REMUS M: Shriram Rajagopalan S: Maintained -F: tools/remus/ +F: docs/README.remus F: tools/blktap2/drivers/block-remus.c F: tools/blktap2/drivers/hashtable* -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:57:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THg-00039l-3K; Sat, 05 Jul 2014 16:57:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THf-00039c-9p for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:55 +0000 Received: from [85.158.143.35:13256] by server-3.bemta-4.messagelabs.com id 72/EF-16194-29E28B35; Sat, 05 Jul 2014 16:57:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1404579472!12607843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13699 invoked from network); 5 Jul 2014 16:57:53 -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; 5 Jul 2014 16:57:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THc-0006Pj-I3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THc-00035M-GK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:52 +0000 Date: Sat, 05 Jul 2014 16:57:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add Yang Hongyang to REMUS 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 01731d0a802614e1fdccad50fb0e1aa62460e338 Author: Yang Hongyang AuthorDate: Fri Jun 6 13:57:35 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 MAINTAINERS: Add Yang Hongyang to REMUS part Add Yang Hongyang as co-maintainer of REMUS. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ae5d7b3..266e47b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -257,6 +257,7 @@ T: git git://xenbits.xen.org/qemu-upstream-*.git REMUS M: Shriram Rajagopalan +M: Yang Hongyang S: Maintained F: docs/README.remus F: tools/blktap2/drivers/block-remus.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 Jul 05 16:57:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:57: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 1X3THg-00039l-3K; Sat, 05 Jul 2014 16:57:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THf-00039c-9p for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:55 +0000 Received: from [85.158.143.35:13256] by server-3.bemta-4.messagelabs.com id 72/EF-16194-29E28B35; Sat, 05 Jul 2014 16:57:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1404579472!12607843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13699 invoked from network); 5 Jul 2014 16:57:53 -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; 5 Jul 2014 16:57:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THc-0006Pj-I3 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THc-00035M-GK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:57:52 +0000 Date: Sat, 05 Jul 2014 16:57:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add Yang Hongyang to REMUS 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 01731d0a802614e1fdccad50fb0e1aa62460e338 Author: Yang Hongyang AuthorDate: Fri Jun 6 13:57:35 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 MAINTAINERS: Add Yang Hongyang to REMUS part Add Yang Hongyang as co-maintainer of REMUS. Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Acked-by: Ian Jackson --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ae5d7b3..266e47b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -257,6 +257,7 @@ T: git git://xenbits.xen.org/qemu-upstream-*.git REMUS M: Shriram Rajagopalan +M: Yang Hongyang S: Maintained F: docs/README.remus F: tools/blktap2/drivers/block-remus.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 Jul 05 16:58:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3THq-0003BW-6Q; Sat, 05 Jul 2014 16:58:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THp-0003BE-7n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:05 +0000 Received: from [85.158.137.68:16958] by server-4.bemta-3.messagelabs.com id F7/0F-23732-C9E28B35; Sat, 05 Jul 2014 16:58:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579482!10497453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14669 invoked from network); 5 Jul 2014 16:58:03 -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 Jul 2014 16:58:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THm-0006QL-Mz for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THm-00035u-LS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:02 +0000 Date: Sat, 05 Jul 2014 16:58:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: make postcopy callback asynchronous X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbe8115b6b1cc8a3a886de61ac3f690caad720c9 Author: Yang Hongyang AuthorDate: Wed Jul 2 16:09:11 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 remus: make postcopy callback asynchronous Make postcopy callback asynchronous. This is a prepare patch of the following patch series. Signed-off-by: Yang Hongyang Acked-by: Ian Jackson --- tools/libxl/libxl_dom.c | 10 +++++++--- tools/libxl/libxl_save_msgs_gen.pl | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0448d17..83eb29a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1479,18 +1479,22 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } -static int libxl__remus_domain_resume_callback(void *data) +static void libxl__remus_domain_resume_callback(void *data) { + int ok = 0; libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ if (libxl__domain_resume(gc, dss->domid, /* Fast Suspend */1)) - return 0; + goto out; /* REMUS TODO: Deal with disk. Start a new network output buffer */ - return 1; + ok = 1; +out: + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); } /*----- remus asynchronous checkpoint callback -----*/ diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 88f4921..6b4b65e 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -24,7 +24,7 @@ our @msgs = ( 'unsigned long', 'done', 'unsigned long', 'total'] ], [ 3, 'scxA', "suspend", [] ], - [ 4, 'scxW', "postcopy", [] ], + [ 4, 'scxA', "postcopy", [] ], [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3THq-0003BW-6Q; Sat, 05 Jul 2014 16:58:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THp-0003BE-7n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:05 +0000 Received: from [85.158.137.68:16958] by server-4.bemta-3.messagelabs.com id F7/0F-23732-C9E28B35; Sat, 05 Jul 2014 16:58:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579482!10497453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14669 invoked from network); 5 Jul 2014 16:58:03 -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 Jul 2014 16:58:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THm-0006QL-Mz for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THm-00035u-LS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:02 +0000 Date: Sat, 05 Jul 2014 16:58:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remus: make postcopy callback asynchronous X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbe8115b6b1cc8a3a886de61ac3f690caad720c9 Author: Yang Hongyang AuthorDate: Wed Jul 2 16:09:11 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:29 2014 +0100 remus: make postcopy callback asynchronous Make postcopy callback asynchronous. This is a prepare patch of the following patch series. Signed-off-by: Yang Hongyang Acked-by: Ian Jackson --- tools/libxl/libxl_dom.c | 10 +++++++--- tools/libxl/libxl_save_msgs_gen.pl | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0448d17..83eb29a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1479,18 +1479,22 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } -static int libxl__remus_domain_resume_callback(void *data) +static void libxl__remus_domain_resume_callback(void *data) { + int ok = 0; libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ if (libxl__domain_resume(gc, dss->domid, /* Fast Suspend */1)) - return 0; + goto out; /* REMUS TODO: Deal with disk. Start a new network output buffer */ - return 1; + ok = 1; +out: + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); } /*----- remus asynchronous checkpoint callback -----*/ diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 88f4921..6b4b65e 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -24,7 +24,7 @@ our @msgs = ( 'unsigned long', 'done', 'unsigned long', 'total'] ], [ 3, 'scxA', "suspend", [] ], - [ 4, 'scxW', "postcopy", [] ], + [ 4, 'scxA', "postcopy", [] ], [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TI0-0003DM-9t; Sat, 05 Jul 2014 16:58:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THz-0003D3-G7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:15 +0000 Received: from [85.158.137.68:17155] by server-12.bemta-3.messagelabs.com id F6/05-12714-6AE28B35; Sat, 05 Jul 2014 16:58:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1404579493!14232393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12675 invoked from network); 5 Jul 2014 16:58:14 -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 Jul 2014 16:58:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THw-0006QR-Rr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THw-00036o-QK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:12 +0000 Date: Sat, 05 Jul 2014 16:58:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix the bug which will cause heap to break down X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35fa07df87bf26ae705fddd85802c47d442cda69 Author: Li Liang AuthorDate: Mon Jun 30 08:48:37 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:51 2014 +0100 libxl: fix the bug which will cause heap to break down If the JSON message contains more bytes than QMP_RECEIVE_BUFFER_SIZE, this bug will break down the heap, that leads to core dump. One more byte should be allocated to contain the appended null character. Signed-off-by: Li Liang Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 8433e42..5cc56b1 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -456,7 +456,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (incomplete) { size_t current_pos = s - incomplete; incomplete = libxl__realloc(gc, incomplete, - incomplete_size + rd); + incomplete_size + rd + 1); strncat(incomplete + incomplete_size, qmp->buffer, rd); s = incomplete + current_pos; incomplete_size += rd; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TI0-0003DM-9t; Sat, 05 Jul 2014 16:58:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THz-0003D3-G7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:15 +0000 Received: from [85.158.137.68:17155] by server-12.bemta-3.messagelabs.com id F6/05-12714-6AE28B35; Sat, 05 Jul 2014 16:58:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1404579493!14232393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12675 invoked from network); 5 Jul 2014 16:58:14 -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 Jul 2014 16:58:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3THw-0006QR-Rr for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3THw-00036o-QK for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:12 +0000 Date: Sat, 05 Jul 2014 16:58:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix the bug which will cause heap to break down X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35fa07df87bf26ae705fddd85802c47d442cda69 Author: Li Liang AuthorDate: Mon Jun 30 08:48:37 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 3 10:49:51 2014 +0100 libxl: fix the bug which will cause heap to break down If the JSON message contains more bytes than QMP_RECEIVE_BUFFER_SIZE, this bug will break down the heap, that leads to core dump. One more byte should be allocated to contain the appended null character. Signed-off-by: Li Liang Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 8433e42..5cc56b1 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -456,7 +456,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (incomplete) { size_t current_pos = s - incomplete; incomplete = libxl__realloc(gc, incomplete, - incomplete_size + rd); + incomplete_size + rd + 1); strncat(incomplete + incomplete_size, qmp->buffer, rd); s = incomplete + current_pos; incomplete_size += rd; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIA-0003Es-Ca; Sat, 05 Jul 2014 16:58:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TI9-0003Ei-Ll for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:25 +0000 Received: from [85.158.137.68:17386] by server-13.bemta-3.messagelabs.com id 28/E3-20015-0BE28B35; Sat, 05 Jul 2014 16:58:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579503!14223404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2745 invoked from network); 5 Jul 2014 16:58:24 -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; 5 Jul 2014 16:58:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TI7-0006QX-0B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TI6-00037A-VS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:22 +0000 Date: Sat, 05 Jul 2014 16:58:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Implement reset for sunxi. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 155751b7e369fa0f9c71c26d9932c888bbde634f Author: Denis Schneider AuthorDate: Thu Jul 3 11:08:49 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:09:33 2014 +0100 xen/arm: Implement reset for sunxi. Enable hardware resets on Allwinner sunxi devices. Signed-off-by: Denis Schneider Acked-by: Ian Campbell --- xen/arch/arm/platforms/sunxi.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c index fb12801..89d8290 100644 --- a/xen/arch/arm/platforms/sunxi.c +++ b/xen/arch/arm/platforms/sunxi.c @@ -16,7 +16,38 @@ * GNU General Public License for more details. */ +#include +#include #include +#include + +/* Watchdog constants: */ +#define SUNXI_WDT_BASE 0x01c20c90 +#define SUNXI_WDT_MODE 0x04 +#define SUNXI_WDT_MODEADDR (SUNXI_WDT_BASE + SUNXI_WDT_MODE) +#define SUNXI_WDT_MODE_EN (1 << 0) +#define SUNXI_WDT_MODE_RST_EN (1 << 1) + + +static void sunxi_reset(void) +{ + void __iomem *wdt; + + wdt = ioremap_nocache(SUNXI_WDT_MODEADDR & PAGE_MASK, PAGE_SIZE); + if ( !wdt ) + { + dprintk(XENLOG_ERR, "Unable to map watchdog register!\n"); + return; + } + + /* Enable watchdog to trigger a reset after 500 ms: */ + writel(SUNXI_WDT_MODE_EN | SUNXI_WDT_MODE_RST_EN, + wdt + (SUNXI_WDT_MODEADDR & ~PAGE_MASK)); + iounmap(wdt); + + for (;;) + wfi(); +} static const char * const sunxi_dt_compat[] __initconst = { @@ -37,6 +68,7 @@ static const struct dt_device_match sunxi_blacklist_dev[] __initconst = PLATFORM_START(sunxi, "Allwinner A20") .compatible = sunxi_dt_compat, .blacklist_dev = sunxi_blacklist_dev, + .reset = sunxi_reset, .dom0_gnttab_start = 0x01d00000, .dom0_gnttab_size = 0x20000, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIA-0003Es-Ca; Sat, 05 Jul 2014 16:58:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TI9-0003Ei-Ll for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:25 +0000 Received: from [85.158.137.68:17386] by server-13.bemta-3.messagelabs.com id 28/E3-20015-0BE28B35; Sat, 05 Jul 2014 16:58:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579503!14223404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2745 invoked from network); 5 Jul 2014 16:58:24 -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; 5 Jul 2014 16:58:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TI7-0006QX-0B for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TI6-00037A-VS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:22 +0000 Date: Sat, 05 Jul 2014 16:58:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Implement reset for sunxi. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 155751b7e369fa0f9c71c26d9932c888bbde634f Author: Denis Schneider AuthorDate: Thu Jul 3 11:08:49 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:09:33 2014 +0100 xen/arm: Implement reset for sunxi. Enable hardware resets on Allwinner sunxi devices. Signed-off-by: Denis Schneider Acked-by: Ian Campbell --- xen/arch/arm/platforms/sunxi.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c index fb12801..89d8290 100644 --- a/xen/arch/arm/platforms/sunxi.c +++ b/xen/arch/arm/platforms/sunxi.c @@ -16,7 +16,38 @@ * GNU General Public License for more details. */ +#include +#include #include +#include + +/* Watchdog constants: */ +#define SUNXI_WDT_BASE 0x01c20c90 +#define SUNXI_WDT_MODE 0x04 +#define SUNXI_WDT_MODEADDR (SUNXI_WDT_BASE + SUNXI_WDT_MODE) +#define SUNXI_WDT_MODE_EN (1 << 0) +#define SUNXI_WDT_MODE_RST_EN (1 << 1) + + +static void sunxi_reset(void) +{ + void __iomem *wdt; + + wdt = ioremap_nocache(SUNXI_WDT_MODEADDR & PAGE_MASK, PAGE_SIZE); + if ( !wdt ) + { + dprintk(XENLOG_ERR, "Unable to map watchdog register!\n"); + return; + } + + /* Enable watchdog to trigger a reset after 500 ms: */ + writel(SUNXI_WDT_MODE_EN | SUNXI_WDT_MODE_RST_EN, + wdt + (SUNXI_WDT_MODEADDR & ~PAGE_MASK)); + iounmap(wdt); + + for (;;) + wfi(); +} static const char * const sunxi_dt_compat[] __initconst = { @@ -37,6 +68,7 @@ static const struct dt_device_match sunxi_blacklist_dev[] __initconst = PLATFORM_START(sunxi, "Allwinner A20") .compatible = sunxi_dt_compat, .blacklist_dev = sunxi_blacklist_dev, + .reset = sunxi_reset, .dom0_gnttab_start = 0x01d00000, .dom0_gnttab_size = 0x20000, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIK-0003GY-G7; Sat, 05 Jul 2014 16:58:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIJ-0003GO-Lc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:35 +0000 Received: from [85.158.143.35:16468] by server-2.bemta-4.messagelabs.com id D5/9C-18579-BBE28B35; Sat, 05 Jul 2014 16:58:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404579513!16057543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23332 invoked from network); 5 Jul 2014 16:58:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:58:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIH-0006Qf-4n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIH-00037n-3V for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:33 +0000 Date: Sat, 05 Jul 2014 16:58:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61 Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Campbell CommitDate: Thu Jul 3 11:11:05 2014 +0100 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 974cded..dea7044 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -231,7 +231,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -431,11 +431,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index a4a2423..2618e11 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -450,9 +450,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIK-0003GY-G7; Sat, 05 Jul 2014 16:58:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIJ-0003GO-Lc for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:35 +0000 Received: from [85.158.143.35:16468] by server-2.bemta-4.messagelabs.com id D5/9C-18579-BBE28B35; Sat, 05 Jul 2014 16:58:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404579513!16057543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23332 invoked from network); 5 Jul 2014 16:58:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:58:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIH-0006Qf-4n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIH-00037n-3V for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:33 +0000 Date: Sat, 05 Jul 2014 16:58:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61 Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Campbell CommitDate: Thu Jul 3 11:11:05 2014 +0100 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 974cded..dea7044 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -231,7 +231,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -431,11 +431,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index a4a2423..2618e11 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -450,9 +450,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIU-0003Ii-LX; Sat, 05 Jul 2014 16:58:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIT-0003IN-Qy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:45 +0000 Received: from [193.109.254.147:2613] by server-16.bemta-14.messagelabs.com id B9/58-07101-5CE28B35; Sat, 05 Jul 2014 16:58:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404579523!11029179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1793 invoked from network); 5 Jul 2014 16:58:44 -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; 5 Jul 2014 16:58:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIR-0006Ql-9N for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIR-00038F-8K for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:43 +0000 Date: Sat, 05 Jul 2014 16:58:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Drop reference on foreign page when guest_physmap_add_entry 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 cc184e82a2522ef188abffc779dd1cd009fa9cc1 Author: Julien Grall AuthorDate: Tue Jul 1 16:16:55 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:13:03 2014 +0100 xen/arm: Drop reference on foreign page when guest_physmap_add_entry has failed When a foreign page is added to the guest p2m, we take a reference on this page. Currently if the mapping has failed when a leak a reference, this will result to the guest will foreign guest will became a zombie as soon as it's destroyed. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7e8e06a..03a0533 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -994,6 +994,7 @@ int xenmem_add_to_physmap_one( unsigned long mfn = 0; int rc; p2m_type_t t; + struct page_info *page = NULL; switch ( space ) { @@ -1041,7 +1042,6 @@ int xenmem_add_to_physmap_one( case XENMAPSPACE_gmfn_foreign: { struct domain *od; - struct page_info *page; p2m_type_t p2mt; od = rcu_lock_domain_by_any_id(foreign_domid); if ( od == NULL ) @@ -1091,6 +1091,14 @@ int xenmem_add_to_physmap_one( /* Map at new location. */ rc = guest_physmap_add_entry(d, gpfn, mfn, 0, t); + /* If we fail to add the mapping, we need to drop the reference we + * took earlier on foreign pages */ + if ( rc && space == XENMAPSPACE_gmfn_foreign ) + { + ASSERT(page != NULL); + put_page(page); + } + 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 Sat Jul 05 16:58:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIU-0003Ii-LX; Sat, 05 Jul 2014 16:58:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIT-0003IN-Qy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:45 +0000 Received: from [193.109.254.147:2613] by server-16.bemta-14.messagelabs.com id B9/58-07101-5CE28B35; Sat, 05 Jul 2014 16:58:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1404579523!11029179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1793 invoked from network); 5 Jul 2014 16:58:44 -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; 5 Jul 2014 16:58:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIR-0006Ql-9N for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIR-00038F-8K for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:43 +0000 Date: Sat, 05 Jul 2014 16:58:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Drop reference on foreign page when guest_physmap_add_entry 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 cc184e82a2522ef188abffc779dd1cd009fa9cc1 Author: Julien Grall AuthorDate: Tue Jul 1 16:16:55 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:13:03 2014 +0100 xen/arm: Drop reference on foreign page when guest_physmap_add_entry has failed When a foreign page is added to the guest p2m, we take a reference on this page. Currently if the mapping has failed when a leak a reference, this will result to the guest will foreign guest will became a zombie as soon as it's destroyed. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7e8e06a..03a0533 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -994,6 +994,7 @@ int xenmem_add_to_physmap_one( unsigned long mfn = 0; int rc; p2m_type_t t; + struct page_info *page = NULL; switch ( space ) { @@ -1041,7 +1042,6 @@ int xenmem_add_to_physmap_one( case XENMAPSPACE_gmfn_foreign: { struct domain *od; - struct page_info *page; p2m_type_t p2mt; od = rcu_lock_domain_by_any_id(foreign_domid); if ( od == NULL ) @@ -1091,6 +1091,14 @@ int xenmem_add_to_physmap_one( /* Map at new location. */ rc = guest_physmap_add_entry(d, gpfn, mfn, 0, t); + /* If we fail to add the mapping, we need to drop the reference we + * took earlier on foreign pages */ + if ( rc && space == XENMAPSPACE_gmfn_foreign ) + { + ASSERT(page != NULL); + put_page(page); + } + 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 Sat Jul 05 16:58:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIf-0003Sz-OE; Sat, 05 Jul 2014 16:58:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIe-0003Q2-3e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:56 +0000 Received: from [85.158.143.35:17098] by server-3.bemta-4.messagelabs.com id 22/10-16194-FCE28B35; Sat, 05 Jul 2014 16:58:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404579533!16034715!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4583 invoked from network); 5 Jul 2014 16:58:54 -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; 5 Jul 2014 16:58:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIb-0006Qu-Ec for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIb-00038b-Cp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:53 +0000 Date: Sat, 05 Jul 2014 16:58:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Relocate internal-only mem_event functions to xc_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 5c8140954cba10e988f1386a1808465747b1856b Author: Tamas K Lengyel AuthorDate: Wed Jul 2 14:04:04 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 3 11:33:15 2014 +0100 libxc: Relocate internal-only mem_event functions to xc_private.h The public xenctrl.h header exposes several internal-only functions of the mem_event system. As one of these functions (xc_mem_event_enable) had been previously used for a different purpose, relocating the entire set of xc_mem_event_* functions makes it easier for an external user of the library to determine which version of the mem_access system libxc exposes. Signed-off-by: Tamas K Lengyel Acked-by: Ian Campbell --- tools/libxc/xc_private.h | 15 +++++++++++++++ tools/libxc/xenctrl.h | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c7730f2..6cc0f2b 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -352,4 +352,19 @@ int xc_ffs64(uint64_t x); #define DOMPRINTF(fmt, args...) xc_dom_printf(dom->xch, fmt, ## args) #define DOMPRINTF_CALLED(xch) xc_dom_printf((xch), "%s: called", __FUNCTION__) +/** + * mem_event operations. Internal use only. + */ +int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, + unsigned int mode, uint32_t *port); +int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, + unsigned int op, unsigned int mode, + uint64_t gfn, void *buffer); +/* + * Enables mem_event and returns the mapped ring page indicated by param. + * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN + */ +void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, + uint32_t *port); + #endif /* __XC_PRIVATE_H__ */ diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 3fe737f..3578b09 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2236,21 +2236,6 @@ void xc_tmem_save_done(xc_interface *xch, int dom); int xc_tmem_restore(xc_interface *xch, int dom, int fd); int xc_tmem_restore_extra(xc_interface *xch, int dom, int fd); -/** - * mem_event operations. Internal use only. - */ -int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, - unsigned int mode, uint32_t *port); -int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, - unsigned int op, unsigned int mode, - uint64_t gfn, void *buffer); -/* - * Enables mem_event and returns the mapped ring page indicated by param. - * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN - */ -void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port); - /** * Mem paging operations. * Paging is supported only on the x86 architecture in 64 bit mode, with -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:58:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:58: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 1X3TIf-0003Sz-OE; Sat, 05 Jul 2014 16:58:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIe-0003Q2-3e for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:56 +0000 Received: from [85.158.143.35:17098] by server-3.bemta-4.messagelabs.com id 22/10-16194-FCE28B35; Sat, 05 Jul 2014 16:58:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1404579533!16034715!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4583 invoked from network); 5 Jul 2014 16:58:54 -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; 5 Jul 2014 16:58:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIb-0006Qu-Ec for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIb-00038b-Cp for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:58:53 +0000 Date: Sat, 05 Jul 2014 16:58:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Relocate internal-only mem_event functions to xc_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 5c8140954cba10e988f1386a1808465747b1856b Author: Tamas K Lengyel AuthorDate: Wed Jul 2 14:04:04 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 3 11:33:15 2014 +0100 libxc: Relocate internal-only mem_event functions to xc_private.h The public xenctrl.h header exposes several internal-only functions of the mem_event system. As one of these functions (xc_mem_event_enable) had been previously used for a different purpose, relocating the entire set of xc_mem_event_* functions makes it easier for an external user of the library to determine which version of the mem_access system libxc exposes. Signed-off-by: Tamas K Lengyel Acked-by: Ian Campbell --- tools/libxc/xc_private.h | 15 +++++++++++++++ tools/libxc/xenctrl.h | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c7730f2..6cc0f2b 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -352,4 +352,19 @@ int xc_ffs64(uint64_t x); #define DOMPRINTF(fmt, args...) xc_dom_printf(dom->xch, fmt, ## args) #define DOMPRINTF_CALLED(xch) xc_dom_printf((xch), "%s: called", __FUNCTION__) +/** + * mem_event operations. Internal use only. + */ +int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, + unsigned int mode, uint32_t *port); +int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, + unsigned int op, unsigned int mode, + uint64_t gfn, void *buffer); +/* + * Enables mem_event and returns the mapped ring page indicated by param. + * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN + */ +void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, + uint32_t *port); + #endif /* __XC_PRIVATE_H__ */ diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 3fe737f..3578b09 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2236,21 +2236,6 @@ void xc_tmem_save_done(xc_interface *xch, int dom); int xc_tmem_restore(xc_interface *xch, int dom, int fd); int xc_tmem_restore_extra(xc_interface *xch, int dom, int fd); -/** - * mem_event operations. Internal use only. - */ -int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, - unsigned int mode, uint32_t *port); -int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, - unsigned int op, unsigned int mode, - uint64_t gfn, void *buffer); -/* - * Enables mem_event and returns the mapped ring page indicated by param. - * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN - */ -void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port); - /** * Mem paging operations. * Paging is supported only on the x86 architecture in 64 bit mode, with -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TIp-0003VM-RH; Sat, 05 Jul 2014 16:59:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIo-0003Uz-A1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:06 +0000 Received: from [193.109.254.147:3077] by server-10.bemta-14.messagelabs.com id F9/4F-01431-9DE28B35; Sat, 05 Jul 2014 16:59:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1404579543!15688767!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5679 invoked from network); 5 Jul 2014 16:59:04 -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; 5 Jul 2014 16:59:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIl-0006RT-Jz for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIl-00039K-IJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:03 +0000 Date: Sat, 05 Jul 2014 16:59:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Small fixes after GICv2 changes by commit ee65c87 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit feff6878d0c50ec8792e01053300cf1bd09dece3 Author: Julien Grall AuthorDate: Wed Jul 2 14:19:20 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:34:04 2014 +0100 xen/arm: Small fixes after GICv2 changes by commit ee65c87 The commit ee65c87 moves the GICv2 code in a separate file. Even though this patch is only deals with code movement, a comment was modify for no reason. Also rename gicv_v2_init into gicv2v_setup which is what the function does and less confusing with the other function called gicv2_init. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 695c232..cc60af8 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -372,12 +372,12 @@ static void gicv2_clear_lr(int lr) writel_relaxed(0, GICH + GICH_LR + lr * 4); } -static int gicv_v2_init(struct domain *d) +static int gicv2v_setup(struct domain *d) { int ret; /* - * Domain 0 gets the hardware address. + * The hardware domain gets the hardware address. * Guests get the virtual platform layout. */ if ( is_hardware_domain(d) ) @@ -566,7 +566,7 @@ const static struct gic_hw_operations gicv2_ops = { .save_state = gicv2_save_state, .restore_state = gicv2_restore_state, .dump_state = gicv2_dump_state, - .gicv_setup = gicv_v2_init, + .gicv_setup = gicv2v_setup, .gic_host_irq_type = &gicv2_host_irq_type, .gic_guest_irq_type = &gicv2_guest_irq_type, .eoi_irq = gicv2_eoi_irq, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TIp-0003VM-RH; Sat, 05 Jul 2014 16:59:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIo-0003Uz-A1 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:06 +0000 Received: from [193.109.254.147:3077] by server-10.bemta-14.messagelabs.com id F9/4F-01431-9DE28B35; Sat, 05 Jul 2014 16:59:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1404579543!15688767!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5679 invoked from network); 5 Jul 2014 16:59:04 -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; 5 Jul 2014 16:59:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIl-0006RT-Jz for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIl-00039K-IJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:03 +0000 Date: Sat, 05 Jul 2014 16:59:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Small fixes after GICv2 changes by commit ee65c87 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit feff6878d0c50ec8792e01053300cf1bd09dece3 Author: Julien Grall AuthorDate: Wed Jul 2 14:19:20 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 11:34:04 2014 +0100 xen/arm: Small fixes after GICv2 changes by commit ee65c87 The commit ee65c87 moves the GICv2 code in a separate file. Even though this patch is only deals with code movement, a comment was modify for no reason. Also rename gicv_v2_init into gicv2v_setup which is what the function does and less confusing with the other function called gicv2_init. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 695c232..cc60af8 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -372,12 +372,12 @@ static void gicv2_clear_lr(int lr) writel_relaxed(0, GICH + GICH_LR + lr * 4); } -static int gicv_v2_init(struct domain *d) +static int gicv2v_setup(struct domain *d) { int ret; /* - * Domain 0 gets the hardware address. + * The hardware domain gets the hardware address. * Guests get the virtual platform layout. */ if ( is_hardware_domain(d) ) @@ -566,7 +566,7 @@ const static struct gic_hw_operations gicv2_ops = { .save_state = gicv2_save_state, .restore_state = gicv2_restore_state, .dump_state = gicv2_dump_state, - .gicv_setup = gicv_v2_init, + .gicv_setup = gicv2v_setup, .gic_host_irq_type = &gicv2_host_irq_type, .gic_guest_irq_type = &gicv2_guest_irq_type, .eoi_irq = gicv2_eoi_irq, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TIz-0003Wo-Ts; Sat, 05 Jul 2014 16:59:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIy-0003WW-G2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:16 +0000 Received: from [193.109.254.147:33158] by server-2.bemta-14.messagelabs.com id 00/08-30377-3EE28B35; Sat, 05 Jul 2014 16:59:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404579553!15689010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18872 invoked from network); 5 Jul 2014 16:59:14 -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; 5 Jul 2014 16:59:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIv-0006RZ-Pk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIv-0003AX-Nx for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:13 +0000 Date: Sat, 05 Jul 2014 16:59:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: add match for non-available nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aacb92ad5a0b18840f89667b9e5bdab047b35b0e Author: Andrii Anisov AuthorDate: Thu Jul 3 12:55:26 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/dt: add match for non-available nodes Signed-off-by: Andrii Anisov Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++++- xen/include/xen/device_tree.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f0b17a3..310635e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -680,7 +680,8 @@ bool_t dt_match_node(const struct dt_device_match *matches, if ( !matches ) return 0; - while ( matches->path || matches->type || matches->compatible ) + while ( matches->path || matches->type || + matches->compatible || matches->not_available ) { bool_t match = 1; @@ -693,6 +694,9 @@ bool_t dt_match_node(const struct dt_device_match *matches, if ( matches->compatible ) match &= dt_device_is_compatible(node, matches->compatible); + if ( matches->not_available ) + match &= !dt_device_is_available(node); + if ( match ) return match; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 25db076..865e1ef 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -65,11 +65,13 @@ struct dt_device_match { const char *path; const char *type; const char *compatible; + const bool_t not_available; }; #define DT_MATCH_PATH(p) { .path = p } #define DT_MATCH_TYPE(typ) { .type = typ } #define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } +#define DT_MATCH_NOT_AVAILABLE() { .not_available = 1 } typedef u32 dt_phandle; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TIz-0003Wo-Ts; Sat, 05 Jul 2014 16:59:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIy-0003WW-G2 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:16 +0000 Received: from [193.109.254.147:33158] by server-2.bemta-14.messagelabs.com id 00/08-30377-3EE28B35; Sat, 05 Jul 2014 16:59:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1404579553!15689010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18872 invoked from network); 5 Jul 2014 16:59:14 -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; 5 Jul 2014 16:59:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TIv-0006RZ-Pk for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TIv-0003AX-Nx for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:13 +0000 Date: Sat, 05 Jul 2014 16:59:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: add match for non-available nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aacb92ad5a0b18840f89667b9e5bdab047b35b0e Author: Andrii Anisov AuthorDate: Thu Jul 3 12:55:26 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/dt: add match for non-available nodes Signed-off-by: Andrii Anisov Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++++- xen/include/xen/device_tree.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f0b17a3..310635e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -680,7 +680,8 @@ bool_t dt_match_node(const struct dt_device_match *matches, if ( !matches ) return 0; - while ( matches->path || matches->type || matches->compatible ) + while ( matches->path || matches->type || + matches->compatible || matches->not_available ) { bool_t match = 1; @@ -693,6 +694,9 @@ bool_t dt_match_node(const struct dt_device_match *matches, if ( matches->compatible ) match &= dt_device_is_compatible(node, matches->compatible); + if ( matches->not_available ) + match &= !dt_device_is_available(node); + if ( match ) return match; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 25db076..865e1ef 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -65,11 +65,13 @@ struct dt_device_match { const char *path; const char *type; const char *compatible; + const bool_t not_available; }; #define DT_MATCH_PATH(p) { .path = p } #define DT_MATCH_TYPE(typ) { .type = typ } #define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } +#define DT_MATCH_NOT_AVAILABLE() { .not_available = 1 } typedef u32 dt_phandle; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJA-0003YU-0Q; Sat, 05 Jul 2014 16:59:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJ8-0003Xy-RG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:26 +0000 Received: from [85.158.137.68:43716] by server-14.bemta-3.messagelabs.com id 92/E1-19846-EEE28B35; Sat, 05 Jul 2014 16:59:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1404579564!14200562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26580 invoked from network); 5 Jul 2014 16:59:25 -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; 5 Jul 2014 16:59:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJ5-0006Rf-Ur for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJ5-0003Az-Sw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:23 +0000 Date: Sat, 05 Jul 2014 16:59:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: dra7: Add UART base address for early logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 920568c92e439ab5c62374f426e059b5056ff9aa Author: Andrii Tseglytskyi AuthorDate: Thu Jul 3 12:55:27 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/arm: dra7: Add UART base address for early logging DRA7 platform uses UART1 for console logging. Patch adds its address to make early printk working. Signed-off-by: Andrii Tseglytskyi Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index b5bf5cb..9319694 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -68,6 +68,11 @@ EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x48020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), dra7) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0x4806A000 +EARLY_UART_REG_SHIFT := 2 +endif ifeq ($(CONFIG_EARLY_PRINTK), sun6i) EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x01c28000 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJA-0003YU-0Q; Sat, 05 Jul 2014 16:59:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJ8-0003Xy-RG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:26 +0000 Received: from [85.158.137.68:43716] by server-14.bemta-3.messagelabs.com id 92/E1-19846-EEE28B35; Sat, 05 Jul 2014 16:59:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1404579564!14200562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26580 invoked from network); 5 Jul 2014 16:59:25 -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; 5 Jul 2014 16:59:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJ5-0006Rf-Ur for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJ5-0003Az-Sw for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:23 +0000 Date: Sat, 05 Jul 2014 16:59:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: dra7: Add UART base address for early logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 920568c92e439ab5c62374f426e059b5056ff9aa Author: Andrii Tseglytskyi AuthorDate: Thu Jul 3 12:55:27 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/arm: dra7: Add UART base address for early logging DRA7 platform uses UART1 for console logging. Patch adds its address to make early printk working. Signed-off-by: Andrii Tseglytskyi Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index b5bf5cb..9319694 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -68,6 +68,11 @@ EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x48020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), dra7) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0x4806A000 +EARLY_UART_REG_SHIFT := 2 +endif ifeq ($(CONFIG_EARLY_PRINTK), sun6i) EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x01c28000 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 16:59:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJK-0003Zn-39; Sat, 05 Jul 2014 16:59:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJJ-0003Zc-3x for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:37 +0000 Received: from [85.158.137.68:24975] by server-13.bemta-3.messagelabs.com id EA/54-20015-8FE28B35; Sat, 05 Jul 2014 16:59:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579574!14223478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4461 invoked from network); 5 Jul 2014 16:59:35 -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; 5 Jul 2014 16:59:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJG-0006Rn-6L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJG-0003BP-1n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:34 +0000 Date: Sat, 05 Jul 2014 16:59:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add DRA7 platform definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf28d7c95639c42d42626e5c332895a5ba717a7e Author: Andrii Tseglytskyi AuthorDate: Thu Jul 3 12:55:28 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/arm: add DRA7 platform definition DRA7 platform definition is added to already existing OMAP5 data. Data definitions, needed for DRA7 are almost common for OMAP5 family. Signed-off-by: Andrii Tseglytskyi Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/omap5.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 76d4d9b..c0f8537 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -144,12 +144,29 @@ static int __init omap5_smp_init(void) return 0; } -static const char const *omap5_dt_compat[] __initconst = +static const char * const omap5_dt_compat[] __initconst = { "ti,omap5", NULL }; +static const char * const dra7_dt_compat[] __initconst = +{ + "ti,dra7", + NULL +}; + +static const struct dt_device_match dra7_blacklist_dev[] __initconst = +{ + /* OMAP Linux kernel handles devices with status "disabled" in a + * weird manner - tries to reset them. While their memory ranges + * are not mapped, this leads to data aborts, so skip these devices + * from DT for dom0. + */ + DT_MATCH_NOT_AVAILABLE(), + { /* sentinel */ }, +}; + PLATFORM_START(omap5, "TI OMAP5") .compatible = omap5_dt_compat, .init_time = omap5_init_time, @@ -161,6 +178,17 @@ PLATFORM_START(omap5, "TI OMAP5") .dom0_gnttab_size = 0x20000, PLATFORM_END +PLATFORM_START(dra7, "TI DRA7") + .compatible = dra7_dt_compat, + .init_time = omap5_init_time, + .cpu_up = cpu_up_send_sgi, + .smp_init = omap5_smp_init, + + .dom0_gnttab_start = 0x4b000000, + .dom0_gnttab_size = 0x20000, + .blacklist_dev = dra7_blacklist_dev, +PLATFORM_END + /* * Local variables: * mode: 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 Jul 05 16:59:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJK-0003Zn-39; Sat, 05 Jul 2014 16:59:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJJ-0003Zc-3x for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:37 +0000 Received: from [85.158.137.68:24975] by server-13.bemta-3.messagelabs.com id EA/54-20015-8FE28B35; Sat, 05 Jul 2014 16:59:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1404579574!14223478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4461 invoked from network); 5 Jul 2014 16:59:35 -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; 5 Jul 2014 16:59:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJG-0006Rn-6L for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJG-0003BP-1n for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:34 +0000 Date: Sat, 05 Jul 2014 16:59:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add DRA7 platform definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf28d7c95639c42d42626e5c332895a5ba717a7e Author: Andrii Tseglytskyi AuthorDate: Thu Jul 3 12:55:28 2014 +0300 Commit: Ian Campbell CommitDate: Thu Jul 3 13:55:32 2014 +0100 xen/arm: add DRA7 platform definition DRA7 platform definition is added to already existing OMAP5 data. Data definitions, needed for DRA7 are almost common for OMAP5 family. Signed-off-by: Andrii Tseglytskyi Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/omap5.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 76d4d9b..c0f8537 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -144,12 +144,29 @@ static int __init omap5_smp_init(void) return 0; } -static const char const *omap5_dt_compat[] __initconst = +static const char * const omap5_dt_compat[] __initconst = { "ti,omap5", NULL }; +static const char * const dra7_dt_compat[] __initconst = +{ + "ti,dra7", + NULL +}; + +static const struct dt_device_match dra7_blacklist_dev[] __initconst = +{ + /* OMAP Linux kernel handles devices with status "disabled" in a + * weird manner - tries to reset them. While their memory ranges + * are not mapped, this leads to data aborts, so skip these devices + * from DT for dom0. + */ + DT_MATCH_NOT_AVAILABLE(), + { /* sentinel */ }, +}; + PLATFORM_START(omap5, "TI OMAP5") .compatible = omap5_dt_compat, .init_time = omap5_init_time, @@ -161,6 +178,17 @@ PLATFORM_START(omap5, "TI OMAP5") .dom0_gnttab_size = 0x20000, PLATFORM_END +PLATFORM_START(dra7, "TI DRA7") + .compatible = dra7_dt_compat, + .init_time = omap5_init_time, + .cpu_up = cpu_up_send_sgi, + .smp_init = omap5_smp_init, + + .dom0_gnttab_start = 0x4b000000, + .dom0_gnttab_size = 0x20000, + .blacklist_dev = dra7_blacklist_dev, +PLATFORM_END + /* * Local variables: * mode: 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 Jul 05 16:59:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJU-0003bV-5v; Sat, 05 Jul 2014 16:59:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJS-0003b4-Uy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:47 +0000 Received: from [85.158.139.211:41154] by server-14.bemta-5.messagelabs.com id 93/91-27057-20F28B35; Sat, 05 Jul 2014 16:59:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1404579584!13833742!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16933 invoked from network); 5 Jul 2014 16:59: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; 5 Jul 2014 16:59:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJQ-0006Rt-Ab for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJQ-0003Bm-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:44 +0000 Date: Sat, 05 Jul 2014 16:59:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Introduce DT_IRQ_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 405c167f0ec9aac19aa894ca4f95ba9227a24291 Author: Julien Grall AuthorDate: Mon Jun 16 17:18:03 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 13:58:08 2014 +0100 libxl/arm: Introduce DT_IRQ_TYPE_* Avoid to use hardcode value when the interrupt type is set. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 21c3399..1edb87a 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -6,6 +6,23 @@ #include #include +/** + * IRQ line type. + * DT_IRQ_TYPE_NONE - default, unspecified type + * DT_IRQ_TYPE_EDGE_RISING - rising edge triggered + * DT_IRQ_TYPE_EDGE_FALLING - falling edge triggered + * DT_IRQ_TYPE_EDGE_BOTH - rising and falling edge triggered + * DT_IRQ_TYPE_LEVEL_HIGH - high level triggered + * DT_IRQ_TYPE_LEVEL_LOW - low level triggered + */ +#define DT_IRQ_TYPE_NONE 0x00000000 +#define DT_IRQ_TYPE_EDGE_RISING 0x00000001 +#define DT_IRQ_TYPE_EDGE_FALLING 0x00000002 +#define DT_IRQ_TYPE_EDGE_BOTH \ + (DT_IRQ_TYPE_EDGE_FALLING | DT_IRQ_TYPE_EDGE_RISING) +#define DT_IRQ_TYPE_LEVEL_HIGH 0x00000004 +#define DT_IRQ_TYPE_LEVEL_LOW 0x00000008 + int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid) { @@ -338,9 +355,12 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); if (res) return res; - set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, 0x8); - set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, 0x8); - set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; @@ -378,7 +398,8 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, * - Active-low level-sensitive * - All cpus */ - set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, 0x8); + set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, &intr, 1); 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 Jul 05 16:59:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJU-0003bV-5v; Sat, 05 Jul 2014 16:59:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJS-0003b4-Uy for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:47 +0000 Received: from [85.158.139.211:41154] by server-14.bemta-5.messagelabs.com id 93/91-27057-20F28B35; Sat, 05 Jul 2014 16:59:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1404579584!13833742!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16933 invoked from network); 5 Jul 2014 16:59: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; 5 Jul 2014 16:59:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJQ-0006Rt-Ab for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJQ-0003Bm-9c for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:44 +0000 Date: Sat, 05 Jul 2014 16:59:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Introduce DT_IRQ_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 405c167f0ec9aac19aa894ca4f95ba9227a24291 Author: Julien Grall AuthorDate: Mon Jun 16 17:18:03 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 13:58:08 2014 +0100 libxl/arm: Introduce DT_IRQ_TYPE_* Avoid to use hardcode value when the interrupt type is set. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 21c3399..1edb87a 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -6,6 +6,23 @@ #include #include +/** + * IRQ line type. + * DT_IRQ_TYPE_NONE - default, unspecified type + * DT_IRQ_TYPE_EDGE_RISING - rising edge triggered + * DT_IRQ_TYPE_EDGE_FALLING - falling edge triggered + * DT_IRQ_TYPE_EDGE_BOTH - rising and falling edge triggered + * DT_IRQ_TYPE_LEVEL_HIGH - high level triggered + * DT_IRQ_TYPE_LEVEL_LOW - low level triggered + */ +#define DT_IRQ_TYPE_NONE 0x00000000 +#define DT_IRQ_TYPE_EDGE_RISING 0x00000001 +#define DT_IRQ_TYPE_EDGE_FALLING 0x00000002 +#define DT_IRQ_TYPE_EDGE_BOTH \ + (DT_IRQ_TYPE_EDGE_FALLING | DT_IRQ_TYPE_EDGE_RISING) +#define DT_IRQ_TYPE_LEVEL_HIGH 0x00000004 +#define DT_IRQ_TYPE_LEVEL_LOW 0x00000008 + int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid) { @@ -338,9 +355,12 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); if (res) return res; - set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, 0x8); - set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, 0x8); - set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; @@ -378,7 +398,8 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, * - Active-low level-sensitive * - All cpus */ - set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, 0x8); + set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, &intr, 1); 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 Jul 05 16:59:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJf-0003dU-BS; Sat, 05 Jul 2014 16:59:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJd-0003dA-7q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:57 +0000 Received: from [85.158.143.35:18829] by server-1.bemta-4.messagelabs.com id 7A/49-09496-C0F28B35; Sat, 05 Jul 2014 16:59:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404579594!16057647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26088 invoked from network); 5 Jul 2014 16:59:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:59:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJa-0006S2-Fn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJa-0003C8-Dn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:54 +0000 Date: Sat, 05 Jul 2014 16:59:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae0e535c8a2274baa445f153b878d570a807c1a3 Author: Julien Grall AuthorDate: Mon Jun 16 17:18:04 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 13:58:08 2014 +0100 libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs The function will be used later during device passthrough to create interrupts in the device tree. Those interrupts are usually SPIs. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 1edb87a..e19e2f4 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -64,14 +64,20 @@ static void set_cell(be32 **cellp, int size, uint64_t val) (*cellp) += cells; } -static void set_interrupt_ppi(gic_interrupt interrupt, unsigned int irq, - unsigned int cpumask, unsigned int level) +static void set_interrupt(gic_interrupt interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) { be32 *cells = interrupt; + int is_ppi = (irq < 32); + + /* SGIs are not describe in the device tree */ + assert(irq >= 16); + + irq -= (is_ppi) ? 16: 32; /* PPIs start at 16, SPIs at 32 */ /* See linux Documentation/devictree/bindings/arm/gic.txt */ - set_cell(&cells, 1, 1); /* is a PPI */ - set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + set_cell(&cells, 1, is_ppi); /* is a PPI? */ + set_cell(&cells, 1, irq); set_cell(&cells, 1, (cpumask << 8) | level); } @@ -355,12 +361,9 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); if (res) return res; - set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; @@ -398,8 +401,7 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, * - Active-low level-sensitive * - All cpus */ - set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(intr, GUEST_EVTCHN_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, &intr, 1); 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 Jul 05 16:59:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 16:59: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 1X3TJf-0003dU-BS; Sat, 05 Jul 2014 16:59:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJd-0003dA-7q for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:57 +0000 Received: from [85.158.143.35:18829] by server-1.bemta-4.messagelabs.com id 7A/49-09496-C0F28B35; Sat, 05 Jul 2014 16:59:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1404579594!16057647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26088 invoked from network); 5 Jul 2014 16:59:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2014 16:59:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJa-0006S2-Fn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJa-0003C8-Dn for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 16:59:54 +0000 Date: Sat, 05 Jul 2014 16:59:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae0e535c8a2274baa445f153b878d570a807c1a3 Author: Julien Grall AuthorDate: Mon Jun 16 17:18:04 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 3 13:58:08 2014 +0100 libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs The function will be used later during device passthrough to create interrupts in the device tree. Those interrupts are usually SPIs. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 1edb87a..e19e2f4 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -64,14 +64,20 @@ static void set_cell(be32 **cellp, int size, uint64_t val) (*cellp) += cells; } -static void set_interrupt_ppi(gic_interrupt interrupt, unsigned int irq, - unsigned int cpumask, unsigned int level) +static void set_interrupt(gic_interrupt interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) { be32 *cells = interrupt; + int is_ppi = (irq < 32); + + /* SGIs are not describe in the device tree */ + assert(irq >= 16); + + irq -= (is_ppi) ? 16: 32; /* PPIs start at 16, SPIs at 32 */ /* See linux Documentation/devictree/bindings/arm/gic.txt */ - set_cell(&cells, 1, 1); /* is a PPI */ - set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + set_cell(&cells, 1, is_ppi); /* is a PPI? */ + set_cell(&cells, 1, irq); set_cell(&cells, 1, (cpumask << 8) | level); } @@ -355,12 +361,9 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); if (res) return res; - set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; @@ -398,8 +401,7 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, * - Active-low level-sensitive * - All cpus */ - set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(intr, GUEST_EVTCHN_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, &intr, 1); 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 Jul 05 17:00:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TK6-0003h6-Eo; Sat, 05 Jul 2014 17:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK5-0003gy-82 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:25 +0000 Received: from [85.158.137.68:32346] by server-9.bemta-3.messagelabs.com id 75/B0-09496-82F28B35; Sat, 05 Jul 2014 17:00:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404579622!9773749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27140 invoked from network); 5 Jul 2014 17:00:23 -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; 5 Jul 2014 17:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJk-0006Us-Na for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJk-0003Do-JM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:04 +0000 Date: Sat, 05 Jul 2014 17:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: add BUILD_BUG_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 4f1f414ab5e93e73bc42435ae10e2ecae6cc5e5a Author: Jan Beulich AuthorDate: Thu Jul 3 16:37:22 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:37:22 2014 +0200 mini-os: add BUILD_BUG_ON() Just copy over what the hypervisor currently uses (comments dropped due to being of unknown origin; the implementation was done by me anyway). Signed-off-by: Jan Beulich Acked-by: Samuel Thibault Acked-by: Tim Deegan --- extras/mini-os/include/lib.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h index 670c14f..62836c7 100644 --- a/extras/mini-os/include/lib.h +++ b/extras/mini-os/include/lib.h @@ -54,6 +54,15 @@ #include #include "gntmap.h" +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) +#define BUILD_BUG_ON_ZERO(cond) \ + sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); }) +#else +#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); }) +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) +#endif + #ifdef HAVE_LIBC #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 Jul 05 17:00:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TK6-0003h6-Eo; Sat, 05 Jul 2014 17:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK5-0003gy-82 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:25 +0000 Received: from [85.158.137.68:32346] by server-9.bemta-3.messagelabs.com id 75/B0-09496-82F28B35; Sat, 05 Jul 2014 17:00:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1404579622!9773749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27140 invoked from network); 5 Jul 2014 17:00:23 -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; 5 Jul 2014 17:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TJk-0006Us-Na for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TJk-0003Do-JM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:04 +0000 Date: Sat, 05 Jul 2014 17:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: add BUILD_BUG_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 4f1f414ab5e93e73bc42435ae10e2ecae6cc5e5a Author: Jan Beulich AuthorDate: Thu Jul 3 16:37:22 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:37:22 2014 +0200 mini-os: add BUILD_BUG_ON() Just copy over what the hypervisor currently uses (comments dropped due to being of unknown origin; the implementation was done by me anyway). Signed-off-by: Jan Beulich Acked-by: Samuel Thibault Acked-by: Tim Deegan --- extras/mini-os/include/lib.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h index 670c14f..62836c7 100644 --- a/extras/mini-os/include/lib.h +++ b/extras/mini-os/include/lib.h @@ -54,6 +54,15 @@ #include #include "gntmap.h" +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) +#define BUILD_BUG_ON_ZERO(cond) \ + sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); }) +#else +#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); }) +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) +#endif + #ifdef HAVE_LIBC #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 Jul 05 17:00:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TK8-0003hl-HT; Sat, 05 Jul 2014 17:00:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK6-0003h5-Ij for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:26 +0000 Received: from [85.158.139.211:46606] by server-4.bemta-5.messagelabs.com id 8C/72-07250-92F28B35; Sat, 05 Jul 2014 17:00:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1404579622!13838911!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25489 invoked from network); 5 Jul 2014 17:00:23 -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; 5 Jul 2014 17:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK2-0006Uz-Lq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TK2-0003FB-KL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:22 +0000 Date: Sat, 05 Jul 2014 17:00:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: update LZO compression to current upstream 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 447f613c54041e78f04ecbbfea42120ab6c76974 Author: Markus F.X.J. Oberhumer AuthorDate: Thu Jul 3 16:38:06 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:38:06 2014 +0200 lzo: update LZO compression to current upstream version This commit updates the kernel LZO code to the current upsteam version which features a significant speed improvement - benchmarking the Calgary and Silesia test corpora typically shows a doubled performance in both compression and decompression on modern i386/x86_64/powerpc machines. Signed-off-by: Markus F.X.J. Oberhumer Original Linux commit: 8b975bd3f9089f8ee5d7bbfd798537b992bbc7e7. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 735 +++++++++++++++++++++++++++---------------------- xen/include/xen/lzo.h | 11 +- 2 files changed, 406 insertions(+), 340 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index f1213d2..7338aee 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -1,7 +1,7 @@ /* - * lzo.c -- LZO1X Compressor from MiniLZO + * lzo.c -- LZO1X Compressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ @@ -14,19 +14,47 @@ /* * lzodefs.h -- architecture, OS and compiler specific defines * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define LZO_VERSION 0x2020 -#define LZO_VERSION_STRING "2.02" -#define LZO_VERSION_DATE "Oct 17 2005" + +#define COPY4(dst, src) \ + put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) +#if defined(__x86_64__) +#define COPY8(dst, src) \ + put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) +#else +#define COPY8(dst, src) \ + COPY4(dst, src); COPY4((dst) + 4, (src) + 4) +#endif + +#ifdef __MINIOS__ +# include +# if __BYTE_ORDER == __LITTLE_ENDIAN +# undef __BIG_ENDIAN +# endif +# if __BYTE_ORDER == __BIG_ENDIAN +# undef __LITTLE_ENDIAN +# endif +#endif + +#if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) +#error "conflicting endian definitions" +#elif defined(__x86_64__) +#define LZO_USE_CTZ64 1 +#define LZO_USE_CTZ32 1 +#elif defined(__i386__) || defined(__powerpc__) +#define LZO_USE_CTZ32 1 +#elif defined(__arm__) && (__LINUX_ARM_ARCH__ >= 5) +#define LZO_USE_CTZ32 1 +#endif #define M1_MAX_OFFSET 0x0400 #define M2_MAX_OFFSET 0x0800 @@ -47,208 +75,257 @@ #define M3_MARKER 32 #define M4_MARKER 16 -#define D_BITS 14 -#define D_MASK ((1u << D_BITS) - 1) +#define lzo_dict_t unsigned short +#define D_BITS 13 +#define D_SIZE (1u << D_BITS) +#define D_MASK (D_SIZE - 1) #define D_HIGH ((D_MASK >> 1) + 1) -#define DX2(p, s1, s2) (((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \ - << (s1)) ^ (p)[0]) -#define DX3(p, s1, s2, s3) ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0]) - /* - * LZO1X Compressor from MiniLZO + * LZO1X Compressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ #ifdef __XEN__ -#include +#include +#include #endif #include #define get_unaligned(_p) (*(_p)) #define put_unaligned(_val,_p) (*(_p)=_val) #define get_unaligned_le16(_p) (*(u16 *)(_p)) +#define get_unaligned_le32(_p) (*(u32 *)(_p)) static noinline size_t -_lzo1x_1_do_compress(const unsigned char *in, size_t in_len, - unsigned char *out, size_t *out_len, void *wrkmem) +lzo1x_1_do_compress(const unsigned char *in, size_t in_len, + unsigned char *out, size_t *out_len, + size_t ti, void *wrkmem) { + const unsigned char *ip; + unsigned char *op; const unsigned char * const in_end = in + in_len; - const unsigned char * const ip_end = in + in_len - M2_MAX_LEN - 5; - const unsigned char ** const dict = wrkmem; - const unsigned char *ip = in, *ii = ip; - const unsigned char *end, *m, *m_pos; - size_t m_off, m_len, dindex; - unsigned char *op = out; + const unsigned char * const ip_end = in + in_len - 20; + const unsigned char *ii; + lzo_dict_t * const dict = (lzo_dict_t *) wrkmem; - ip += 4; + op = out; + ip = in; + ii = ip; + ip += ti < 4 ? 4 - ti : 0; for (;;) { - dindex = ((size_t)(0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK; - m_pos = dict[dindex]; - - if (m_pos < in) - goto literal; - - if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) - goto literal; - - m_off = ip - m_pos; - if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) - goto try_match; - - dindex = (dindex & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f); - m_pos = dict[dindex]; - - if (m_pos < in) - goto literal; - - if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) - goto literal; - - m_off = ip - m_pos; - if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) - goto try_match; - - goto literal; - - try_match: - if (get_unaligned((const unsigned short *)m_pos) - == get_unaligned((const unsigned short *)ip)) { - if (likely(m_pos[2] == ip[2])) - goto match; - } - + const unsigned char *m_pos; + size_t t, m_len, m_off; + u32 dv; literal: - dict[dindex] = ip; - ++ip; + ip += 1 + ((ip - ii) >> 5); + next: if (unlikely(ip >= ip_end)) break; - continue; - - match: - dict[dindex] = ip; - if (ip != ii) { - size_t t = ip - ii; + dv = get_unaligned_le32(ip); + t = ((dv * 0x1824429d) >> (32 - D_BITS)) & D_MASK; + m_pos = in + dict[t]; + dict[t] = (lzo_dict_t) (ip - in); + if (unlikely(dv != get_unaligned_le32(m_pos))) + goto literal; + ii -= ti; + ti = 0; + t = ip - ii; + if (t != 0) { if (t <= 3) { op[-2] |= t; - } else if (t <= 18) { + COPY4(op, ii); + op += t; + } else if (t <= 16) { *op++ = (t - 3); + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += t; } else { - size_t tt = t - 18; - - *op++ = 0; - while (tt > 255) { - tt -= 255; + if (t <= 18) { + *op++ = (t - 3); + } else { + size_t tt = t - 18; *op++ = 0; + while (unlikely(tt > 255)) { + tt -= 255; + *op++ = 0; + } + *op++ = tt; } - *op++ = tt; + do { + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += 16; + ii += 16; + t -= 16; + } while (t >= 16); + if (t > 0) do { + *op++ = *ii++; + } while (--t > 0); } + } + + m_len = 4; + { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && defined(LZO_USE_CTZ64) + u64 v; + v = get_unaligned((const u64 *) (ip + m_len)) ^ + get_unaligned((const u64 *) (m_pos + m_len)); + if (unlikely(v == 0)) { + do { + m_len += 8; + v = get_unaligned((const u64 *) (ip + m_len)) ^ + get_unaligned((const u64 *) (m_pos + m_len)); + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (v == 0); + } +# if defined(__LITTLE_ENDIAN) + m_len += (unsigned) __builtin_ctzll(v) / 8; +# elif defined(__BIG_ENDIAN) + m_len += (unsigned) __builtin_clzll(v) / 8; +# else +# error "missing endian definition" +# endif +#elif defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && defined(LZO_USE_CTZ32) + u32 v; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (unlikely(v == 0)) { do { - *op++ = *ii++; - } while (--t > 0); + m_len += 4; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (v != 0) + break; + m_len += 4; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (v == 0); + } +# if defined(__LITTLE_ENDIAN) + m_len += (unsigned) __builtin_ctz(v) / 8; +# elif defined(__BIG_ENDIAN) + m_len += (unsigned) __builtin_clz(v) / 8; +# else +# error "missing endian definition" +# endif +#else + if (unlikely(ip[m_len] == m_pos[m_len])) { + do { + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (ip[m_len] == m_pos[m_len]); + } +#endif } + m_len_done: - ip += 3; - if (m_pos[3] != *ip++ || m_pos[4] != *ip++ - || m_pos[5] != *ip++ || m_pos[6] != *ip++ - || m_pos[7] != *ip++ || m_pos[8] != *ip++) { - --ip; - m_len = ip - ii; - - if (m_off <= M2_MAX_OFFSET) { - m_off -= 1; - *op++ = (((m_len - 1) << 5) - | ((m_off & 7) << 2)); - *op++ = (m_off >> 3); - } else if (m_off <= M3_MAX_OFFSET) { - m_off -= 1; + m_off = ip - m_pos; + ip += m_len; + ii = ip; + if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET) { + m_off -= 1; + *op++ = (((m_len - 1) << 5) | ((m_off & 7) << 2)); + *op++ = (m_off >> 3); + } else if (m_off <= M3_MAX_OFFSET) { + m_off -= 1; + if (m_len <= M3_MAX_LEN) *op++ = (M3_MARKER | (m_len - 2)); - goto m3_m4_offset; - } else { - m_off -= 0x4000; - - *op++ = (M4_MARKER | ((m_off & 0x4000) >> 11) - | (m_len - 2)); - goto m3_m4_offset; + else { + m_len -= M3_MAX_LEN; + *op++ = M3_MARKER | 0; + while (unlikely(m_len > 255)) { + m_len -= 255; + *op++ = 0; + } + *op++ = (m_len); } + *op++ = (m_off << 2); + *op++ = (m_off >> 6); } else { - end = in_end; - m = m_pos + M2_MAX_LEN + 1; - - while (ip < end && *m == *ip) { - m++; - ip++; - } - m_len = ip - ii; - - if (m_off <= M3_MAX_OFFSET) { - m_off -= 1; - if (m_len <= 33) { - *op++ = (M3_MARKER | (m_len - 2)); - } else { - m_len -= 33; - *op++ = M3_MARKER | 0; - goto m3_m4_len; - } - } else { - m_off -= 0x4000; - if (m_len <= M4_MAX_LEN) { - *op++ = (M4_MARKER - | ((m_off & 0x4000) >> 11) + m_off -= 0x4000; + if (m_len <= M4_MAX_LEN) + *op++ = (M4_MARKER | ((m_off >> 11) & 8) | (m_len - 2)); - } else { - m_len -= M4_MAX_LEN; - *op++ = (M4_MARKER - | ((m_off & 0x4000) >> 11)); - m3_m4_len: - while (m_len > 255) { - m_len -= 255; - *op++ = 0; - } - - *op++ = (m_len); + else { + m_len -= M4_MAX_LEN; + *op++ = (M4_MARKER | ((m_off >> 11) & 8)); + while (unlikely(m_len > 255)) { + m_len -= 255; + *op++ = 0; } + *op++ = (m_len); } - m3_m4_offset: - *op++ = ((m_off & 63) << 2); + *op++ = (m_off << 2); *op++ = (m_off >> 6); } - - ii = ip; - if (unlikely(ip >= ip_end)) - break; + goto next; } - *out_len = op - out; - return in_end - ii; + return in_end - (ii - ti); } -int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, - size_t *out_len, void *wrkmem) +int lzo1x_1_compress(const unsigned char *in, size_t in_len, + unsigned char *out, size_t *out_len, + void *wrkmem) { - const unsigned char *ii; + const unsigned char *ip = in; unsigned char *op = out; - size_t t; + size_t l = in_len; + size_t t = 0; - if (unlikely(in_len <= M2_MAX_LEN + 5)) { - t = in_len; - } else { - t = _lzo1x_1_do_compress(in, in_len, op, out_len, wrkmem); + while (l > 20) { + size_t ll = l <= (M4_MAX_OFFSET + 1) ? l : (M4_MAX_OFFSET + 1); + uintptr_t ll_end = (uintptr_t) ip + ll; + if ((ll_end + ((t + ll) >> 5)) <= ll_end) + break; + BUILD_BUG_ON(D_SIZE * sizeof(lzo_dict_t) > LZO1X_1_MEM_COMPRESS); + memset(wrkmem, 0, D_SIZE * sizeof(lzo_dict_t)); + t = lzo1x_1_do_compress(ip, ll, op, out_len, t, wrkmem); + ip += ll; op += *out_len; + l -= ll; } + t += l; if (t > 0) { - ii = in + in_len - t; + const unsigned char *ii = in + in_len - t; if (op == out && t <= 238) { *op++ = (17 + t); @@ -258,16 +335,21 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, *op++ = (t - 3); } else { size_t tt = t - 18; - *op++ = 0; while (tt > 255) { tt -= 255; *op++ = 0; } - *op++ = tt; } - do { + if (t >= 16) do { + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += 16; + ii += 16; + t -= 16; + } while (t >= 16); + if (t > 0) do { *op++ = *ii++; } while (--t > 0); } @@ -281,232 +363,215 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, } /* - * LZO1X Decompressor from MiniLZO + * LZO1X Decompressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x)) -#define HAVE_OP(x, op_end, op) ((size_t)(op_end - op) < (x)) -#define HAVE_LB(m_pos, out, op) (m_pos < out || m_pos >= op) - -#define COPY4(dst, src) \ - put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) +#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) +#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) +#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun +#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun +#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { + unsigned char *op; + const unsigned char *ip; + size_t t, next; + size_t state = 0; + const unsigned char *m_pos; const unsigned char * const ip_end = in + in_len; unsigned char * const op_end = out + *out_len; - const unsigned char *ip = in, *m_pos; - unsigned char *op = out; - size_t t; - *out_len = 0; + op = out; + ip = in; + if (unlikely(in_len < 3)) + goto input_overrun; if (*ip > 17) { t = *ip++ - 17; - if (t < 4) + if (t < 4) { + next = t; goto match_next; - if (HAVE_OP(t, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 1, ip_end, ip)) - goto input_overrun; - do { - *op++ = *ip++; - } while (--t > 0); - goto first_literal_run; - } - - while ((ip < ip_end)) { - t = *ip++; - if (t >= 16) - goto match; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { - t += 255; - ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - } - t += 15 + *ip++; - } - if (HAVE_OP(t + 3, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 4, ip_end, ip)) - goto input_overrun; - - COPY4(op, ip); - op += 4; - ip += 4; - if (--t > 0) { - if (t >= 4) { - do { - COPY4(op, ip); - op += 4; - ip += 4; - t -= 4; - } while (t >= 4); - if (t > 0) { - do { - *op++ = *ip++; - } while (--t > 0); - } - } else { - do { - *op++ = *ip++; - } while (--t > 0); - } } + goto copy_literal_run; + } - first_literal_run: + for (;;) { t = *ip++; - if (t >= 16) - goto match; - m_pos = op - (1 + M2_MAX_OFFSET); - m_pos -= t >> 2; - m_pos -= *ip++ << 2; - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - - if (HAVE_OP(3, op_end, op)) - goto output_overrun; - *op++ = *m_pos++; - *op++ = *m_pos++; - *op++ = *m_pos; - - goto match_done; - - do { - match: - if (t >= 64) { - m_pos = op - 1; - m_pos -= (t >> 2) & 7; - m_pos -= *ip++ << 3; - t = (t >> 5) - 1; - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(t + 3 - 1, op_end, op)) - goto output_overrun; - goto copy_match; - } else if (t >= 32) { - t &= 31; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { + if (t < 16) { + if (likely(state == 0)) { + if (unlikely(t == 0)) { + while (unlikely(*ip == 0)) { t += 255; ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; + NEED_IP(1); } - t += 31 + *ip++; + t += 15 + *ip++; } - m_pos = op - 1; - m_pos -= get_unaligned_le16(ip) >> 2; - ip += 2; - } else if (t >= 16) { - m_pos = op; - m_pos -= (t & 8) << 11; - - t &= 7; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { - t += 255; - ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - } - t += 7 + *ip++; + t += 3; + copy_literal_run: +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { + const unsigned char *ie = ip + t; + unsigned char *oe = op + t; + do { + COPY8(op, ip); + op += 8; + ip += 8; + COPY8(op, ip); + op += 8; + ip += 8; + } while (ip < ie); + ip = ie; + op = oe; + } else +#endif + { + NEED_OP(t); + NEED_IP(t + 3); + do { + *op++ = *ip++; + } while (--t > 0); } - m_pos -= get_unaligned_le16(ip) >> 2; - ip += 2; - if (m_pos == op) - goto eof_found; - m_pos -= 0x4000; - } else { + state = 4; + continue; + } else if (state != 4) { + next = t & 3; m_pos = op - 1; m_pos -= t >> 2; m_pos -= *ip++ << 2; - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(2, op_end, op)) - goto output_overrun; - - *op++ = *m_pos++; - *op++ = *m_pos; - goto match_done; + TEST_LB(m_pos); + NEED_OP(2); + op[0] = m_pos[0]; + op[1] = m_pos[1]; + op += 2; + goto match_next; + } else { + next = t & 3; + m_pos = op - (1 + M2_MAX_OFFSET); + m_pos -= t >> 2; + m_pos -= *ip++ << 2; + t = 3; } - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(t + 3 - 1, op_end, op)) - goto output_overrun; - - if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) { - COPY4(op, m_pos); - op += 4; - m_pos += 4; - t -= 4 - (3 - 1); + } else if (t >= 64) { + next = t & 3; + m_pos = op - 1; + m_pos -= (t >> 2) & 7; + m_pos -= *ip++ << 3; + t = (t >> 5) - 1 + (3 - 1); + } else if (t >= 32) { + t = (t & 31) + (3 - 1); + if (unlikely(t == 2)) { + while (unlikely(*ip == 0)) { + t += 255; + ip++; + NEED_IP(1); + } + t += 31 + *ip++; + NEED_IP(2); + } + m_pos = op - 1; + next = get_unaligned_le16(ip); + ip += 2; + m_pos -= next >> 2; + next &= 3; + } else { + m_pos = op; + m_pos -= (t & 8) << 11; + t = (t & 7) + (3 - 1); + if (unlikely(t == 2)) { + while (unlikely(*ip == 0)) { + t += 255; + ip++; + NEED_IP(1); + } + t += 7 + *ip++; + NEED_IP(2); + } + next = get_unaligned_le16(ip); + ip += 2; + m_pos -= next >> 2; + next &= 3; + if (m_pos == op) + goto eof_found; + m_pos -= 0x4000; + } + TEST_LB(m_pos); +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (op - m_pos >= 8) { + unsigned char *oe = op + t; + if (likely(HAVE_OP(t + 15))) { do { - COPY4(op, m_pos); - op += 4; - m_pos += 4; - t -= 4; - } while (t >= 4); - if (t > 0) - do { - *op++ = *m_pos++; - } while (--t > 0); + COPY8(op, m_pos); + op += 8; + m_pos += 8; + COPY8(op, m_pos); + op += 8; + m_pos += 8; + } while (op < oe); + op = oe; + if (HAVE_IP(6)) { + state = next; + COPY4(op, ip); + op += next; + ip += next; + continue; + } } else { - copy_match: - *op++ = *m_pos++; - *op++ = *m_pos++; + NEED_OP(t); do { *op++ = *m_pos++; - } while (--t > 0); + } while (op < oe); } - match_done: - t = ip[-2] & 3; - if (t == 0) - break; + } else +#endif + { + unsigned char *oe = op + t; + NEED_OP(t); + op[0] = m_pos[0]; + op[1] = m_pos[1]; + op += 2; + m_pos += 2; + do { + *op++ = *m_pos++; + } while (op < oe); + } match_next: - if (HAVE_OP(t, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 1, ip_end, ip)) - goto input_overrun; - - *op++ = *ip++; - if (t > 1) { + state = next; + t = next; +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (likely(HAVE_IP(6) && HAVE_OP(4))) { + COPY4(op, ip); + op += t; + ip += t; + } else +#endif + { + NEED_IP(t + 3); + NEED_OP(t); + while (t > 0) { *op++ = *ip++; - if (t > 2) - *op++ = *ip++; + t--; } - - t = *ip++; - } while (ip < ip_end); + } } - *out_len = op - out; - return LZO_E_EOF_NOT_FOUND; - eof_found: *out_len = op - out; - return (ip == ip_end ? LZO_E_OK : - (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); + return (t != 3 ? LZO_E_ERROR : + ip == ip_end ? LZO_E_OK : + ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN); + input_overrun: *out_len = op - out; return LZO_E_INPUT_OVERRUN; diff --git a/xen/include/xen/lzo.h b/xen/include/xen/lzo.h index cbf135f..e920027 100644 --- a/xen/include/xen/lzo.h +++ b/xen/include/xen/lzo.h @@ -4,22 +4,22 @@ * LZO Public Kernel Interface * A mini subset of the LZO real-time data compression library * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define LZO1X_MEM_COMPRESS (16384 * sizeof(unsigned char *)) -#define LZO1X_1_MEM_COMPRESS LZO1X_MEM_COMPRESS +#define LZO1X_1_MEM_COMPRESS (8192 * sizeof(unsigned short)) +#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS #define lzo1x_worst_compress(x) ((x) + ((x) / 16) + 64 + 3) -/* This requires 'workmem' of size LZO1X_1_MEM_COMPRESS */ +/* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */ int lzo1x_1_compress(const unsigned char *src, size_t src_len, unsigned char *dst, size_t *dst_len, void *wrkmem); @@ -40,5 +40,6 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len, #define LZO_E_EOF_NOT_FOUND (-7) #define LZO_E_INPUT_NOT_CONSUMED (-8) #define LZO_E_NOT_YET_IMPLEMENTED (-9) +#define LZO_E_INVALID_ARGUMENT (-10) #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 Jul 05 17:00:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TK8-0003hl-HT; Sat, 05 Jul 2014 17:00:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK6-0003h5-Ij for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:26 +0000 Received: from [85.158.139.211:46606] by server-4.bemta-5.messagelabs.com id 8C/72-07250-92F28B35; Sat, 05 Jul 2014 17:00:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1404579622!13838911!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25489 invoked from network); 5 Jul 2014 17:00:23 -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; 5 Jul 2014 17:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TK2-0006Uz-Lq for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TK2-0003FB-KL for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:22 +0000 Date: Sat, 05 Jul 2014 17:00:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: update LZO compression to current upstream 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 447f613c54041e78f04ecbbfea42120ab6c76974 Author: Markus F.X.J. Oberhumer AuthorDate: Thu Jul 3 16:38:06 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:38:06 2014 +0200 lzo: update LZO compression to current upstream version This commit updates the kernel LZO code to the current upsteam version which features a significant speed improvement - benchmarking the Calgary and Silesia test corpora typically shows a doubled performance in both compression and decompression on modern i386/x86_64/powerpc machines. Signed-off-by: Markus F.X.J. Oberhumer Original Linux commit: 8b975bd3f9089f8ee5d7bbfd798537b992bbc7e7. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 735 +++++++++++++++++++++++++++---------------------- xen/include/xen/lzo.h | 11 +- 2 files changed, 406 insertions(+), 340 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index f1213d2..7338aee 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -1,7 +1,7 @@ /* - * lzo.c -- LZO1X Compressor from MiniLZO + * lzo.c -- LZO1X Compressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ @@ -14,19 +14,47 @@ /* * lzodefs.h -- architecture, OS and compiler specific defines * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define LZO_VERSION 0x2020 -#define LZO_VERSION_STRING "2.02" -#define LZO_VERSION_DATE "Oct 17 2005" + +#define COPY4(dst, src) \ + put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) +#if defined(__x86_64__) +#define COPY8(dst, src) \ + put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) +#else +#define COPY8(dst, src) \ + COPY4(dst, src); COPY4((dst) + 4, (src) + 4) +#endif + +#ifdef __MINIOS__ +# include +# if __BYTE_ORDER == __LITTLE_ENDIAN +# undef __BIG_ENDIAN +# endif +# if __BYTE_ORDER == __BIG_ENDIAN +# undef __LITTLE_ENDIAN +# endif +#endif + +#if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) +#error "conflicting endian definitions" +#elif defined(__x86_64__) +#define LZO_USE_CTZ64 1 +#define LZO_USE_CTZ32 1 +#elif defined(__i386__) || defined(__powerpc__) +#define LZO_USE_CTZ32 1 +#elif defined(__arm__) && (__LINUX_ARM_ARCH__ >= 5) +#define LZO_USE_CTZ32 1 +#endif #define M1_MAX_OFFSET 0x0400 #define M2_MAX_OFFSET 0x0800 @@ -47,208 +75,257 @@ #define M3_MARKER 32 #define M4_MARKER 16 -#define D_BITS 14 -#define D_MASK ((1u << D_BITS) - 1) +#define lzo_dict_t unsigned short +#define D_BITS 13 +#define D_SIZE (1u << D_BITS) +#define D_MASK (D_SIZE - 1) #define D_HIGH ((D_MASK >> 1) + 1) -#define DX2(p, s1, s2) (((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \ - << (s1)) ^ (p)[0]) -#define DX3(p, s1, s2, s3) ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0]) - /* - * LZO1X Compressor from MiniLZO + * LZO1X Compressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ #ifdef __XEN__ -#include +#include +#include #endif #include #define get_unaligned(_p) (*(_p)) #define put_unaligned(_val,_p) (*(_p)=_val) #define get_unaligned_le16(_p) (*(u16 *)(_p)) +#define get_unaligned_le32(_p) (*(u32 *)(_p)) static noinline size_t -_lzo1x_1_do_compress(const unsigned char *in, size_t in_len, - unsigned char *out, size_t *out_len, void *wrkmem) +lzo1x_1_do_compress(const unsigned char *in, size_t in_len, + unsigned char *out, size_t *out_len, + size_t ti, void *wrkmem) { + const unsigned char *ip; + unsigned char *op; const unsigned char * const in_end = in + in_len; - const unsigned char * const ip_end = in + in_len - M2_MAX_LEN - 5; - const unsigned char ** const dict = wrkmem; - const unsigned char *ip = in, *ii = ip; - const unsigned char *end, *m, *m_pos; - size_t m_off, m_len, dindex; - unsigned char *op = out; + const unsigned char * const ip_end = in + in_len - 20; + const unsigned char *ii; + lzo_dict_t * const dict = (lzo_dict_t *) wrkmem; - ip += 4; + op = out; + ip = in; + ii = ip; + ip += ti < 4 ? 4 - ti : 0; for (;;) { - dindex = ((size_t)(0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK; - m_pos = dict[dindex]; - - if (m_pos < in) - goto literal; - - if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) - goto literal; - - m_off = ip - m_pos; - if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) - goto try_match; - - dindex = (dindex & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f); - m_pos = dict[dindex]; - - if (m_pos < in) - goto literal; - - if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) - goto literal; - - m_off = ip - m_pos; - if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) - goto try_match; - - goto literal; - - try_match: - if (get_unaligned((const unsigned short *)m_pos) - == get_unaligned((const unsigned short *)ip)) { - if (likely(m_pos[2] == ip[2])) - goto match; - } - + const unsigned char *m_pos; + size_t t, m_len, m_off; + u32 dv; literal: - dict[dindex] = ip; - ++ip; + ip += 1 + ((ip - ii) >> 5); + next: if (unlikely(ip >= ip_end)) break; - continue; - - match: - dict[dindex] = ip; - if (ip != ii) { - size_t t = ip - ii; + dv = get_unaligned_le32(ip); + t = ((dv * 0x1824429d) >> (32 - D_BITS)) & D_MASK; + m_pos = in + dict[t]; + dict[t] = (lzo_dict_t) (ip - in); + if (unlikely(dv != get_unaligned_le32(m_pos))) + goto literal; + ii -= ti; + ti = 0; + t = ip - ii; + if (t != 0) { if (t <= 3) { op[-2] |= t; - } else if (t <= 18) { + COPY4(op, ii); + op += t; + } else if (t <= 16) { *op++ = (t - 3); + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += t; } else { - size_t tt = t - 18; - - *op++ = 0; - while (tt > 255) { - tt -= 255; + if (t <= 18) { + *op++ = (t - 3); + } else { + size_t tt = t - 18; *op++ = 0; + while (unlikely(tt > 255)) { + tt -= 255; + *op++ = 0; + } + *op++ = tt; } - *op++ = tt; + do { + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += 16; + ii += 16; + t -= 16; + } while (t >= 16); + if (t > 0) do { + *op++ = *ii++; + } while (--t > 0); } + } + + m_len = 4; + { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && defined(LZO_USE_CTZ64) + u64 v; + v = get_unaligned((const u64 *) (ip + m_len)) ^ + get_unaligned((const u64 *) (m_pos + m_len)); + if (unlikely(v == 0)) { + do { + m_len += 8; + v = get_unaligned((const u64 *) (ip + m_len)) ^ + get_unaligned((const u64 *) (m_pos + m_len)); + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (v == 0); + } +# if defined(__LITTLE_ENDIAN) + m_len += (unsigned) __builtin_ctzll(v) / 8; +# elif defined(__BIG_ENDIAN) + m_len += (unsigned) __builtin_clzll(v) / 8; +# else +# error "missing endian definition" +# endif +#elif defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && defined(LZO_USE_CTZ32) + u32 v; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (unlikely(v == 0)) { do { - *op++ = *ii++; - } while (--t > 0); + m_len += 4; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (v != 0) + break; + m_len += 4; + v = get_unaligned((const u32 *) (ip + m_len)) ^ + get_unaligned((const u32 *) (m_pos + m_len)); + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (v == 0); + } +# if defined(__LITTLE_ENDIAN) + m_len += (unsigned) __builtin_ctz(v) / 8; +# elif defined(__BIG_ENDIAN) + m_len += (unsigned) __builtin_clz(v) / 8; +# else +# error "missing endian definition" +# endif +#else + if (unlikely(ip[m_len] == m_pos[m_len])) { + do { + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (ip[m_len] != m_pos[m_len]) + break; + m_len += 1; + if (unlikely(ip + m_len >= ip_end)) + goto m_len_done; + } while (ip[m_len] == m_pos[m_len]); + } +#endif } + m_len_done: - ip += 3; - if (m_pos[3] != *ip++ || m_pos[4] != *ip++ - || m_pos[5] != *ip++ || m_pos[6] != *ip++ - || m_pos[7] != *ip++ || m_pos[8] != *ip++) { - --ip; - m_len = ip - ii; - - if (m_off <= M2_MAX_OFFSET) { - m_off -= 1; - *op++ = (((m_len - 1) << 5) - | ((m_off & 7) << 2)); - *op++ = (m_off >> 3); - } else if (m_off <= M3_MAX_OFFSET) { - m_off -= 1; + m_off = ip - m_pos; + ip += m_len; + ii = ip; + if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET) { + m_off -= 1; + *op++ = (((m_len - 1) << 5) | ((m_off & 7) << 2)); + *op++ = (m_off >> 3); + } else if (m_off <= M3_MAX_OFFSET) { + m_off -= 1; + if (m_len <= M3_MAX_LEN) *op++ = (M3_MARKER | (m_len - 2)); - goto m3_m4_offset; - } else { - m_off -= 0x4000; - - *op++ = (M4_MARKER | ((m_off & 0x4000) >> 11) - | (m_len - 2)); - goto m3_m4_offset; + else { + m_len -= M3_MAX_LEN; + *op++ = M3_MARKER | 0; + while (unlikely(m_len > 255)) { + m_len -= 255; + *op++ = 0; + } + *op++ = (m_len); } + *op++ = (m_off << 2); + *op++ = (m_off >> 6); } else { - end = in_end; - m = m_pos + M2_MAX_LEN + 1; - - while (ip < end && *m == *ip) { - m++; - ip++; - } - m_len = ip - ii; - - if (m_off <= M3_MAX_OFFSET) { - m_off -= 1; - if (m_len <= 33) { - *op++ = (M3_MARKER | (m_len - 2)); - } else { - m_len -= 33; - *op++ = M3_MARKER | 0; - goto m3_m4_len; - } - } else { - m_off -= 0x4000; - if (m_len <= M4_MAX_LEN) { - *op++ = (M4_MARKER - | ((m_off & 0x4000) >> 11) + m_off -= 0x4000; + if (m_len <= M4_MAX_LEN) + *op++ = (M4_MARKER | ((m_off >> 11) & 8) | (m_len - 2)); - } else { - m_len -= M4_MAX_LEN; - *op++ = (M4_MARKER - | ((m_off & 0x4000) >> 11)); - m3_m4_len: - while (m_len > 255) { - m_len -= 255; - *op++ = 0; - } - - *op++ = (m_len); + else { + m_len -= M4_MAX_LEN; + *op++ = (M4_MARKER | ((m_off >> 11) & 8)); + while (unlikely(m_len > 255)) { + m_len -= 255; + *op++ = 0; } + *op++ = (m_len); } - m3_m4_offset: - *op++ = ((m_off & 63) << 2); + *op++ = (m_off << 2); *op++ = (m_off >> 6); } - - ii = ip; - if (unlikely(ip >= ip_end)) - break; + goto next; } - *out_len = op - out; - return in_end - ii; + return in_end - (ii - ti); } -int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, - size_t *out_len, void *wrkmem) +int lzo1x_1_compress(const unsigned char *in, size_t in_len, + unsigned char *out, size_t *out_len, + void *wrkmem) { - const unsigned char *ii; + const unsigned char *ip = in; unsigned char *op = out; - size_t t; + size_t l = in_len; + size_t t = 0; - if (unlikely(in_len <= M2_MAX_LEN + 5)) { - t = in_len; - } else { - t = _lzo1x_1_do_compress(in, in_len, op, out_len, wrkmem); + while (l > 20) { + size_t ll = l <= (M4_MAX_OFFSET + 1) ? l : (M4_MAX_OFFSET + 1); + uintptr_t ll_end = (uintptr_t) ip + ll; + if ((ll_end + ((t + ll) >> 5)) <= ll_end) + break; + BUILD_BUG_ON(D_SIZE * sizeof(lzo_dict_t) > LZO1X_1_MEM_COMPRESS); + memset(wrkmem, 0, D_SIZE * sizeof(lzo_dict_t)); + t = lzo1x_1_do_compress(ip, ll, op, out_len, t, wrkmem); + ip += ll; op += *out_len; + l -= ll; } + t += l; if (t > 0) { - ii = in + in_len - t; + const unsigned char *ii = in + in_len - t; if (op == out && t <= 238) { *op++ = (17 + t); @@ -258,16 +335,21 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, *op++ = (t - 3); } else { size_t tt = t - 18; - *op++ = 0; while (tt > 255) { tt -= 255; *op++ = 0; } - *op++ = tt; } - do { + if (t >= 16) do { + COPY8(op, ii); + COPY8(op + 8, ii + 8); + op += 16; + ii += 16; + t -= 16; + } while (t >= 16); + if (t > 0) do { *op++ = *ii++; } while (--t > 0); } @@ -281,232 +363,215 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, unsigned char *out, } /* - * LZO1X Decompressor from MiniLZO + * LZO1X Decompressor from LZO * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x)) -#define HAVE_OP(x, op_end, op) ((size_t)(op_end - op) < (x)) -#define HAVE_LB(m_pos, out, op) (m_pos < out || m_pos >= op) - -#define COPY4(dst, src) \ - put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) +#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) +#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) +#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun +#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun +#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { + unsigned char *op; + const unsigned char *ip; + size_t t, next; + size_t state = 0; + const unsigned char *m_pos; const unsigned char * const ip_end = in + in_len; unsigned char * const op_end = out + *out_len; - const unsigned char *ip = in, *m_pos; - unsigned char *op = out; - size_t t; - *out_len = 0; + op = out; + ip = in; + if (unlikely(in_len < 3)) + goto input_overrun; if (*ip > 17) { t = *ip++ - 17; - if (t < 4) + if (t < 4) { + next = t; goto match_next; - if (HAVE_OP(t, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 1, ip_end, ip)) - goto input_overrun; - do { - *op++ = *ip++; - } while (--t > 0); - goto first_literal_run; - } - - while ((ip < ip_end)) { - t = *ip++; - if (t >= 16) - goto match; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { - t += 255; - ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - } - t += 15 + *ip++; - } - if (HAVE_OP(t + 3, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 4, ip_end, ip)) - goto input_overrun; - - COPY4(op, ip); - op += 4; - ip += 4; - if (--t > 0) { - if (t >= 4) { - do { - COPY4(op, ip); - op += 4; - ip += 4; - t -= 4; - } while (t >= 4); - if (t > 0) { - do { - *op++ = *ip++; - } while (--t > 0); - } - } else { - do { - *op++ = *ip++; - } while (--t > 0); - } } + goto copy_literal_run; + } - first_literal_run: + for (;;) { t = *ip++; - if (t >= 16) - goto match; - m_pos = op - (1 + M2_MAX_OFFSET); - m_pos -= t >> 2; - m_pos -= *ip++ << 2; - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - - if (HAVE_OP(3, op_end, op)) - goto output_overrun; - *op++ = *m_pos++; - *op++ = *m_pos++; - *op++ = *m_pos; - - goto match_done; - - do { - match: - if (t >= 64) { - m_pos = op - 1; - m_pos -= (t >> 2) & 7; - m_pos -= *ip++ << 3; - t = (t >> 5) - 1; - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(t + 3 - 1, op_end, op)) - goto output_overrun; - goto copy_match; - } else if (t >= 32) { - t &= 31; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { + if (t < 16) { + if (likely(state == 0)) { + if (unlikely(t == 0)) { + while (unlikely(*ip == 0)) { t += 255; ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; + NEED_IP(1); } - t += 31 + *ip++; + t += 15 + *ip++; } - m_pos = op - 1; - m_pos -= get_unaligned_le16(ip) >> 2; - ip += 2; - } else if (t >= 16) { - m_pos = op; - m_pos -= (t & 8) << 11; - - t &= 7; - if (t == 0) { - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - while (*ip == 0) { - t += 255; - ip++; - if (HAVE_IP(1, ip_end, ip)) - goto input_overrun; - } - t += 7 + *ip++; + t += 3; + copy_literal_run: +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { + const unsigned char *ie = ip + t; + unsigned char *oe = op + t; + do { + COPY8(op, ip); + op += 8; + ip += 8; + COPY8(op, ip); + op += 8; + ip += 8; + } while (ip < ie); + ip = ie; + op = oe; + } else +#endif + { + NEED_OP(t); + NEED_IP(t + 3); + do { + *op++ = *ip++; + } while (--t > 0); } - m_pos -= get_unaligned_le16(ip) >> 2; - ip += 2; - if (m_pos == op) - goto eof_found; - m_pos -= 0x4000; - } else { + state = 4; + continue; + } else if (state != 4) { + next = t & 3; m_pos = op - 1; m_pos -= t >> 2; m_pos -= *ip++ << 2; - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(2, op_end, op)) - goto output_overrun; - - *op++ = *m_pos++; - *op++ = *m_pos; - goto match_done; + TEST_LB(m_pos); + NEED_OP(2); + op[0] = m_pos[0]; + op[1] = m_pos[1]; + op += 2; + goto match_next; + } else { + next = t & 3; + m_pos = op - (1 + M2_MAX_OFFSET); + m_pos -= t >> 2; + m_pos -= *ip++ << 2; + t = 3; } - - if (HAVE_LB(m_pos, out, op)) - goto lookbehind_overrun; - if (HAVE_OP(t + 3 - 1, op_end, op)) - goto output_overrun; - - if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) { - COPY4(op, m_pos); - op += 4; - m_pos += 4; - t -= 4 - (3 - 1); + } else if (t >= 64) { + next = t & 3; + m_pos = op - 1; + m_pos -= (t >> 2) & 7; + m_pos -= *ip++ << 3; + t = (t >> 5) - 1 + (3 - 1); + } else if (t >= 32) { + t = (t & 31) + (3 - 1); + if (unlikely(t == 2)) { + while (unlikely(*ip == 0)) { + t += 255; + ip++; + NEED_IP(1); + } + t += 31 + *ip++; + NEED_IP(2); + } + m_pos = op - 1; + next = get_unaligned_le16(ip); + ip += 2; + m_pos -= next >> 2; + next &= 3; + } else { + m_pos = op; + m_pos -= (t & 8) << 11; + t = (t & 7) + (3 - 1); + if (unlikely(t == 2)) { + while (unlikely(*ip == 0)) { + t += 255; + ip++; + NEED_IP(1); + } + t += 7 + *ip++; + NEED_IP(2); + } + next = get_unaligned_le16(ip); + ip += 2; + m_pos -= next >> 2; + next &= 3; + if (m_pos == op) + goto eof_found; + m_pos -= 0x4000; + } + TEST_LB(m_pos); +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (op - m_pos >= 8) { + unsigned char *oe = op + t; + if (likely(HAVE_OP(t + 15))) { do { - COPY4(op, m_pos); - op += 4; - m_pos += 4; - t -= 4; - } while (t >= 4); - if (t > 0) - do { - *op++ = *m_pos++; - } while (--t > 0); + COPY8(op, m_pos); + op += 8; + m_pos += 8; + COPY8(op, m_pos); + op += 8; + m_pos += 8; + } while (op < oe); + op = oe; + if (HAVE_IP(6)) { + state = next; + COPY4(op, ip); + op += next; + ip += next; + continue; + } } else { - copy_match: - *op++ = *m_pos++; - *op++ = *m_pos++; + NEED_OP(t); do { *op++ = *m_pos++; - } while (--t > 0); + } while (op < oe); } - match_done: - t = ip[-2] & 3; - if (t == 0) - break; + } else +#endif + { + unsigned char *oe = op + t; + NEED_OP(t); + op[0] = m_pos[0]; + op[1] = m_pos[1]; + op += 2; + m_pos += 2; + do { + *op++ = *m_pos++; + } while (op < oe); + } match_next: - if (HAVE_OP(t, op_end, op)) - goto output_overrun; - if (HAVE_IP(t + 1, ip_end, ip)) - goto input_overrun; - - *op++ = *ip++; - if (t > 1) { + state = next; + t = next; +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + if (likely(HAVE_IP(6) && HAVE_OP(4))) { + COPY4(op, ip); + op += t; + ip += t; + } else +#endif + { + NEED_IP(t + 3); + NEED_OP(t); + while (t > 0) { *op++ = *ip++; - if (t > 2) - *op++ = *ip++; + t--; } - - t = *ip++; - } while (ip < ip_end); + } } - *out_len = op - out; - return LZO_E_EOF_NOT_FOUND; - eof_found: *out_len = op - out; - return (ip == ip_end ? LZO_E_OK : - (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); + return (t != 3 ? LZO_E_ERROR : + ip == ip_end ? LZO_E_OK : + ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN); + input_overrun: *out_len = op - out; return LZO_E_INPUT_OVERRUN; diff --git a/xen/include/xen/lzo.h b/xen/include/xen/lzo.h index cbf135f..e920027 100644 --- a/xen/include/xen/lzo.h +++ b/xen/include/xen/lzo.h @@ -4,22 +4,22 @@ * LZO Public Kernel Interface * A mini subset of the LZO real-time data compression library * - * Copyright (C) 1996-2005 Markus F.X.J. Oberhumer + * Copyright (C) 1996-2012 Markus F.X.J. Oberhumer * * The full LZO package can be found at: * http://www.oberhumer.com/opensource/lzo/ * - * Changed for kernel use by: + * Changed for Linux kernel use by: * Nitin Gupta * Richard Purdie */ -#define LZO1X_MEM_COMPRESS (16384 * sizeof(unsigned char *)) -#define LZO1X_1_MEM_COMPRESS LZO1X_MEM_COMPRESS +#define LZO1X_1_MEM_COMPRESS (8192 * sizeof(unsigned short)) +#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS #define lzo1x_worst_compress(x) ((x) + ((x) / 16) + 64 + 3) -/* This requires 'workmem' of size LZO1X_1_MEM_COMPRESS */ +/* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */ int lzo1x_1_compress(const unsigned char *src, size_t src_len, unsigned char *dst, size_t *dst_len, void *wrkmem); @@ -40,5 +40,6 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len, #define LZO_E_EOF_NOT_FOUND (-7) #define LZO_E_INPUT_NOT_CONSUMED (-8) #define LZO_E_NOT_YET_IMPLEMENTED (-9) +#define LZO_E_INVALID_ARGUMENT (-10) #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 Jul 05 17:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKG-0003kU-PZ; Sat, 05 Jul 2014 17:00:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKF-0003jy-LH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:35 +0000 Received: from [85.158.143.35:22368] by server-1.bemta-4.messagelabs.com id D0/99-09496-33F28B35; Sat, 05 Jul 2014 17:00:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1404579633!16089746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29689 invoked from network); 5 Jul 2014 17:00:33 -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; 5 Jul 2014 17:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKC-0006VA-RG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKC-0003FY-P7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:32 +0000 Date: Sat, 05 Jul 2014 17:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: properly check for overruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 504f70b624063bbb32d43cdfe6e8409eaac1fa8e Author: Greg Kroah-Hartman AuthorDate: Thu Jul 3 16:39:30 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:39:30 2014 +0200 lzo: properly check for overruns The lzo decompressor can, if given some really crazy data, possibly overrun some variable types. Modify the checking logic to properly detect overruns before they happen. Reported-by: "Don A. Bailey" Signed-off-by: Greg Kroah-Hartman Original Linux commit: 206a81c18401c0cde6e579164f752c4b147324ce. This is CVE-2014-4607 (but not a security issue in Xen, since the code is only used for loading the Dom0 kernel and _inside_ an eventual DomU for loading its kernel). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 62 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 7338aee..0bec625 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -375,11 +375,31 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, * Richard Purdie */ -#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) -#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) -#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun -#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun -#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun +#define HAVE_IP(t, x) \ + (((size_t)(ip_end - ip) >= (size_t)(t + x)) && \ + (((t + x) >= t) && ((t + x) >= x))) + +#define HAVE_OP(t, x) \ + (((size_t)(op_end - op) >= (size_t)(t + x)) && \ + (((t + x) >= t) && ((t + x) >= x))) + +#define NEED_IP(t, x) \ + do { \ + if (!HAVE_IP(t, x)) \ + goto input_overrun; \ + } while (0) + +#define NEED_OP(t, x) \ + do { \ + if (!HAVE_OP(t, x)) \ + goto output_overrun; \ + } while (0) + +#define TEST_LB(m_pos) \ + do { \ + if ((m_pos) < out) \ + goto lookbehind_overrun; \ + } while (0) int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) @@ -414,14 +434,14 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 15 + *ip++; } t += 3; copy_literal_run: #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { + if (likely(HAVE_IP(t, 15) && HAVE_OP(t, 15))) { const unsigned char *ie = ip + t; unsigned char *oe = op + t; do { @@ -437,8 +457,8 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else #endif { - NEED_OP(t); - NEED_IP(t + 3); + NEED_OP(t, 0); + NEED_IP(t, 3); do { *op++ = *ip++; } while (--t > 0); @@ -451,7 +471,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= t >> 2; m_pos -= *ip++ << 2; TEST_LB(m_pos); - NEED_OP(2); + NEED_OP(2, 0); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -475,10 +495,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 31 + *ip++; - NEED_IP(2); + NEED_IP(2, 0); } m_pos = op - 1; next = get_unaligned_le16(ip); @@ -493,10 +513,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 7 + *ip++; - NEED_IP(2); + NEED_IP(2, 0); } next = get_unaligned_le16(ip); ip += 2; @@ -510,7 +530,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) if (op - m_pos >= 8) { unsigned char *oe = op + t; - if (likely(HAVE_OP(t + 15))) { + if (likely(HAVE_OP(t, 15))) { do { COPY8(op, m_pos); op += 8; @@ -520,7 +540,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos += 8; } while (op < oe); op = oe; - if (HAVE_IP(6)) { + if (HAVE_IP(6, 0)) { state = next; COPY4(op, ip); op += next; @@ -528,7 +548,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, continue; } } else { - NEED_OP(t); + NEED_OP(t, 0); do { *op++ = *m_pos++; } while (op < oe); @@ -537,7 +557,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #endif { unsigned char *oe = op + t; - NEED_OP(t); + NEED_OP(t, 0); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -550,15 +570,15 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, state = next; t = next; #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(6) && HAVE_OP(4))) { + if (likely(HAVE_IP(6, 0) && HAVE_OP(4, 0))) { COPY4(op, ip); op += t; ip += t; } else #endif { - NEED_IP(t + 3); - NEED_OP(t); + NEED_IP(t, 3); + NEED_OP(t, 0); while (t > 0) { *op++ = *ip++; 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 Jul 05 17:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKG-0003kU-PZ; Sat, 05 Jul 2014 17:00:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKF-0003jy-LH for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:35 +0000 Received: from [85.158.143.35:22368] by server-1.bemta-4.messagelabs.com id D0/99-09496-33F28B35; Sat, 05 Jul 2014 17:00:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1404579633!16089746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29689 invoked from network); 5 Jul 2014 17:00:33 -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; 5 Jul 2014 17:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKC-0006VA-RG for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKC-0003FY-P7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:32 +0000 Date: Sat, 05 Jul 2014 17:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: properly check for overruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 504f70b624063bbb32d43cdfe6e8409eaac1fa8e Author: Greg Kroah-Hartman AuthorDate: Thu Jul 3 16:39:30 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:39:30 2014 +0200 lzo: properly check for overruns The lzo decompressor can, if given some really crazy data, possibly overrun some variable types. Modify the checking logic to properly detect overruns before they happen. Reported-by: "Don A. Bailey" Signed-off-by: Greg Kroah-Hartman Original Linux commit: 206a81c18401c0cde6e579164f752c4b147324ce. This is CVE-2014-4607 (but not a security issue in Xen, since the code is only used for loading the Dom0 kernel and _inside_ an eventual DomU for loading its kernel). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 62 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 7338aee..0bec625 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -375,11 +375,31 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, * Richard Purdie */ -#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) -#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) -#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun -#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun -#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun +#define HAVE_IP(t, x) \ + (((size_t)(ip_end - ip) >= (size_t)(t + x)) && \ + (((t + x) >= t) && ((t + x) >= x))) + +#define HAVE_OP(t, x) \ + (((size_t)(op_end - op) >= (size_t)(t + x)) && \ + (((t + x) >= t) && ((t + x) >= x))) + +#define NEED_IP(t, x) \ + do { \ + if (!HAVE_IP(t, x)) \ + goto input_overrun; \ + } while (0) + +#define NEED_OP(t, x) \ + do { \ + if (!HAVE_OP(t, x)) \ + goto output_overrun; \ + } while (0) + +#define TEST_LB(m_pos) \ + do { \ + if ((m_pos) < out) \ + goto lookbehind_overrun; \ + } while (0) int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) @@ -414,14 +434,14 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 15 + *ip++; } t += 3; copy_literal_run: #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { + if (likely(HAVE_IP(t, 15) && HAVE_OP(t, 15))) { const unsigned char *ie = ip + t; unsigned char *oe = op + t; do { @@ -437,8 +457,8 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else #endif { - NEED_OP(t); - NEED_IP(t + 3); + NEED_OP(t, 0); + NEED_IP(t, 3); do { *op++ = *ip++; } while (--t > 0); @@ -451,7 +471,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= t >> 2; m_pos -= *ip++ << 2; TEST_LB(m_pos); - NEED_OP(2); + NEED_OP(2, 0); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -475,10 +495,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 31 + *ip++; - NEED_IP(2); + NEED_IP(2, 0); } m_pos = op - 1; next = get_unaligned_le16(ip); @@ -493,10 +513,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1); + NEED_IP(1, 0); } t += 7 + *ip++; - NEED_IP(2); + NEED_IP(2, 0); } next = get_unaligned_le16(ip); ip += 2; @@ -510,7 +530,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) if (op - m_pos >= 8) { unsigned char *oe = op + t; - if (likely(HAVE_OP(t + 15))) { + if (likely(HAVE_OP(t, 15))) { do { COPY8(op, m_pos); op += 8; @@ -520,7 +540,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos += 8; } while (op < oe); op = oe; - if (HAVE_IP(6)) { + if (HAVE_IP(6, 0)) { state = next; COPY4(op, ip); op += next; @@ -528,7 +548,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, continue; } } else { - NEED_OP(t); + NEED_OP(t, 0); do { *op++ = *m_pos++; } while (op < oe); @@ -537,7 +557,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #endif { unsigned char *oe = op + t; - NEED_OP(t); + NEED_OP(t, 0); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -550,15 +570,15 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, state = next; t = next; #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(6) && HAVE_OP(4))) { + if (likely(HAVE_IP(6, 0) && HAVE_OP(4, 0))) { COPY4(op, ip); op += t; ip += t; } else #endif { - NEED_IP(t + 3); - NEED_OP(t); + NEED_IP(t, 3); + NEED_OP(t, 0); while (t > 0) { *op++ = *ip++; 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 Jul 05 17:00:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKQ-0003oM-SO; Sat, 05 Jul 2014 17:00:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKP-0003o6-UJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:46 +0000 Received: from [85.158.139.211:47302] by server-17.bemta-5.messagelabs.com id 87/8D-08711-D3F28B35; Sat, 05 Jul 2014 17:00:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1404579643!6265901!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23699 invoked from network); 5 Jul 2014 17:00:44 -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 Jul 2014 17:00:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKN-0006VG-5E for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKM-0003Fx-VM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:42 +0000 Date: Sat, 05 Jul 2014 17:00:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3eb1c708ab0fe1067a436498a684907afa14dacf Author: Andrew Cooper AuthorDate: Thu Jul 3 16:51:13 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:51:13 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a4effc3..d62c715 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1027,7 +1027,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( d->controller_pause_count > 0 ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1043,7 +1043,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( d->controller_pause_count > 0 ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1061,7 +1061,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index c3a576e..cd64aea 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -317,7 +317,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( !is_hardware_domain(d) ) @@ -755,18 +755,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; + struct vcpu *curr = current; + struct domain *d = curr->domain; - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ - - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -914,17 +909,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 000993f..c326aba 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -394,22 +394,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index f920e1a..d5bc461 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -366,7 +366,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -769,8 +769,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:00:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKQ-0003oM-SO; Sat, 05 Jul 2014 17:00:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKP-0003o6-UJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:46 +0000 Received: from [85.158.139.211:47302] by server-17.bemta-5.messagelabs.com id 87/8D-08711-D3F28B35; Sat, 05 Jul 2014 17:00:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1404579643!6265901!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23699 invoked from network); 5 Jul 2014 17:00:44 -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 Jul 2014 17:00:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKN-0006VG-5E for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKM-0003Fx-VM for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:42 +0000 Date: Sat, 05 Jul 2014 17:00:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3eb1c708ab0fe1067a436498a684907afa14dacf Author: Andrew Cooper AuthorDate: Thu Jul 3 16:51:13 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 3 16:51:13 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a4effc3..d62c715 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1027,7 +1027,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( d->controller_pause_count > 0 ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1043,7 +1043,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( d->controller_pause_count > 0 ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1061,7 +1061,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index c3a576e..cd64aea 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -317,7 +317,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( !is_hardware_domain(d) ) @@ -755,18 +755,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; + struct vcpu *curr = current; + struct domain *d = curr->domain; - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ - - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -914,17 +909,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 000993f..c326aba 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -394,22 +394,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index f920e1a..d5bc461 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -366,7 +366,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -769,8 +769,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:00:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TKb-0003qF-0N; Sat, 05 Jul 2014 17:00:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKZ-0003pw-Us for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:56 +0000 Received: from [85.158.137.68:52063] by server-8.bemta-3.messagelabs.com id EF/A8-07166-74F28B35; Sat, 05 Jul 2014 17:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579653!10497647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19568 invoked from network); 5 Jul 2014 17:00:54 -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 Jul 2014 17:00:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKX-0006VP-AQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKX-0003GM-8T for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:53 +0000 Date: Sat, 05 Jul 2014 17:00:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix stub domain build breakage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61e928387682f0106ad7d3fada98cf0b598d238c Author: Aravindh Puthiyaparambil AuthorDate: Thu Jul 3 20:15:03 2014 -0700 Commit: Ian Campbell CommitDate: Fri Jul 4 09:47:01 2014 +0100 libxc: Fix stub domain build breakage Commit 447f613c (lzo: update LZO compression to current upstream version) broke the stub domain build. This patch fixes the build breakage. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan Beulich Signed-off-by: Aravindh Puthiyaparambil Acked-by: Ian Campbell --- tools/libxc/xc_dom_decompress_unsafe_lzo1x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c b/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c index 57c73e3..59888b9 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c +++ b/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c @@ -10,6 +10,7 @@ typedef uint8_t u8; typedef uint32_t u32; typedef uint16_t u16; +typedef uint64_t u64; #define likely(a) a #define noinline -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:00:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:00: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 1X3TKb-0003qF-0N; Sat, 05 Jul 2014 17:00:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKZ-0003pw-Us for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:56 +0000 Received: from [85.158.137.68:52063] by server-8.bemta-3.messagelabs.com id EF/A8-07166-74F28B35; Sat, 05 Jul 2014 17:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1404579653!10497647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19568 invoked from network); 5 Jul 2014 17:00:54 -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 Jul 2014 17:00:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKX-0006VP-AQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKX-0003GM-8T for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:00:53 +0000 Date: Sat, 05 Jul 2014 17:00:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix stub domain build breakage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61e928387682f0106ad7d3fada98cf0b598d238c Author: Aravindh Puthiyaparambil AuthorDate: Thu Jul 3 20:15:03 2014 -0700 Commit: Ian Campbell CommitDate: Fri Jul 4 09:47:01 2014 +0100 libxc: Fix stub domain build breakage Commit 447f613c (lzo: update LZO compression to current upstream version) broke the stub domain build. This patch fixes the build breakage. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan Beulich Signed-off-by: Aravindh Puthiyaparambil Acked-by: Ian Campbell --- tools/libxc/xc_dom_decompress_unsafe_lzo1x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c b/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c index 57c73e3..59888b9 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c +++ b/tools/libxc/xc_dom_decompress_unsafe_lzo1x.c @@ -10,6 +10,7 @@ typedef uint8_t u8; typedef uint32_t u32; typedef uint16_t u16; +typedef uint64_t u64; #define likely(a) a #define noinline -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKl-0003rq-4n; Sat, 05 Jul 2014 17:01:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKk-0003ra-2F for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:06 +0000 Received: from [85.158.143.35:23562] by server-1.bemta-4.messagelabs.com id 2C/B9-09496-15F28B35; Sat, 05 Jul 2014 17:01:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1404579663!16049512!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15862 invoked from network); 5 Jul 2014 17:01:04 -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; 5 Jul 2014 17:01:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKh-0006Vy-FS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKh-0003H0-Dd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:03 +0000 Date: Sat, 05 Jul 2014 17:01:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Use xc_hvm_param_get() instead of xc_get_hvm_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 d704085d7407c8051ab9b44ad8a48448e2997ea4 Author: Aravindh Puthiyaparambil AuthorDate: Thu Jul 3 12:26:33 2014 -0700 Commit: Ian Campbell CommitDate: Fri Jul 4 09:47:54 2014 +0100 tools/libxc: Use xc_hvm_param_get() instead of xc_get_hvm_param() Use xc_hvm_param_get() instead of xc_get_hvm_param() as the latter has been deprecated. Signed-off-by: Aravindh Puthiyaparambil Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxc/xc_mem_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c index 0b2eecb..faf1cc6 100644 --- a/tools/libxc/xc_mem_event.c +++ b/tools/libxc/xc_mem_event.c @@ -60,7 +60,7 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, uint32_t *port) { void *ring_page = NULL; - unsigned long pfn; + uint64_t pfn; xen_pfn_t ring_pfn, mmap_pfn; unsigned int op, mode; int rc1, rc2, saved_errno; @@ -80,7 +80,7 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, } /* Get the pfn of the ring page */ - rc1 = xc_get_hvm_param(xch, domain_id, param, &pfn); + rc1 = xc_hvm_param_get(xch, domain_id, param, &pfn); if ( rc1 != 0 ) { PERROR("Failed to get pfn of ring page\n"); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKl-0003rq-4n; Sat, 05 Jul 2014 17:01:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKk-0003ra-2F for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:06 +0000 Received: from [85.158.143.35:23562] by server-1.bemta-4.messagelabs.com id 2C/B9-09496-15F28B35; Sat, 05 Jul 2014 17:01:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1404579663!16049512!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15862 invoked from network); 5 Jul 2014 17:01:04 -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; 5 Jul 2014 17:01:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKh-0006Vy-FS for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKh-0003H0-Dd for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:03 +0000 Date: Sat, 05 Jul 2014 17:01:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Use xc_hvm_param_get() instead of xc_get_hvm_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 d704085d7407c8051ab9b44ad8a48448e2997ea4 Author: Aravindh Puthiyaparambil AuthorDate: Thu Jul 3 12:26:33 2014 -0700 Commit: Ian Campbell CommitDate: Fri Jul 4 09:47:54 2014 +0100 tools/libxc: Use xc_hvm_param_get() instead of xc_get_hvm_param() Use xc_hvm_param_get() instead of xc_get_hvm_param() as the latter has been deprecated. Signed-off-by: Aravindh Puthiyaparambil Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxc/xc_mem_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c index 0b2eecb..faf1cc6 100644 --- a/tools/libxc/xc_mem_event.c +++ b/tools/libxc/xc_mem_event.c @@ -60,7 +60,7 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, uint32_t *port) { void *ring_page = NULL; - unsigned long pfn; + uint64_t pfn; xen_pfn_t ring_pfn, mmap_pfn; unsigned int op, mode; int rc1, rc2, saved_errno; @@ -80,7 +80,7 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, } /* Get the pfn of the ring page */ - rc1 = xc_get_hvm_param(xch, domain_id, param, &pfn); + rc1 = xc_hvm_param_get(xch, domain_id, param, &pfn); if ( rc1 != 0 ) { PERROR("Failed to get pfn of ring page\n"); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKw-0003tj-7s; Sat, 05 Jul 2014 17: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 1X3TKu-0003tO-GQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:16 +0000 Received: from [85.158.143.35:56218] by server-3.bemta-4.messagelabs.com id 9D/B0-16194-B5F28B35; Sat, 05 Jul 2014 17:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1404579673!16044924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29659 invoked from network); 5 Jul 2014 17: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; 5 Jul 2014 17:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKr-0006W4-Ky for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKr-0003If-Ik for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:13 +0000 Date: Sat, 05 Jul 2014 17:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: exempt dom0 from domU node quotas X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ce275826b9816c094225b1117ef3ecbdaba0281 Author: Vincent Bernardoff AuthorDate: Thu Jul 3 15:02:17 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 4 09:49:09 2014 +0100 oxenstored: exempt dom0 from domU node quotas If a domU has exhausted its quota we still want the toolstack in dom0 to be able to create new nodes in places like /local/domain/%d/control/shutdown Without this patch, a domU which has exhausted its quota can only be powered off, which is not as good as being able to request a clean shutdown. Signed-off-by: Thomas Sanders Signed-off-by: Euan Harris Acked-by: David Scott --- tools/ocaml/xenstored/store.ml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index cac0b44..3efe515 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -383,7 +383,7 @@ let set_node store path node = let write store perm path value = let node, existing = get_deepest_existing_node store path in let owner = Node.get_owner node in - if existing then + if existing || (Perms.Connection.is_dom0 perm) then (* Only check the string length limit *) Quota.check store.quota (-1) (String.length value) else @@ -398,7 +398,7 @@ let mkdir store perm path = let node, existing = get_deepest_existing_node store path in let owner = Node.get_owner node in (* It's upt to the mkdir logic to decide what to do with existing path *) - if not existing then Quota.check store.quota owner 0; + if not (existing || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; Quota.add_entry store.quota owner @@ -416,7 +416,7 @@ let setperms store perm path nperms = | Some node -> let old_owner = Node.get_owner node in let new_owner = Perms.Node.get_owner nperms in - if old_owner <> new_owner then Quota.check store.quota new_owner 0; + if not ((old_owner = new_owner) || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota new_owner 0; store.root <- path_setperms store perm path nperms; Quota.del_entry store.quota old_owner; Quota.add_entry store.quota new_owner -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17: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 1X3TKw-0003tj-7s; Sat, 05 Jul 2014 17: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 1X3TKu-0003tO-GQ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:16 +0000 Received: from [85.158.143.35:56218] by server-3.bemta-4.messagelabs.com id 9D/B0-16194-B5F28B35; Sat, 05 Jul 2014 17:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1404579673!16044924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29659 invoked from network); 5 Jul 2014 17: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; 5 Jul 2014 17:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TKr-0006W4-Ky for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TKr-0003If-Ik for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:13 +0000 Date: Sat, 05 Jul 2014 17:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: exempt dom0 from domU node quotas X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ce275826b9816c094225b1117ef3ecbdaba0281 Author: Vincent Bernardoff AuthorDate: Thu Jul 3 15:02:17 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 4 09:49:09 2014 +0100 oxenstored: exempt dom0 from domU node quotas If a domU has exhausted its quota we still want the toolstack in dom0 to be able to create new nodes in places like /local/domain/%d/control/shutdown Without this patch, a domU which has exhausted its quota can only be powered off, which is not as good as being able to request a clean shutdown. Signed-off-by: Thomas Sanders Signed-off-by: Euan Harris Acked-by: David Scott --- tools/ocaml/xenstored/store.ml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index cac0b44..3efe515 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -383,7 +383,7 @@ let set_node store path node = let write store perm path value = let node, existing = get_deepest_existing_node store path in let owner = Node.get_owner node in - if existing then + if existing || (Perms.Connection.is_dom0 perm) then (* Only check the string length limit *) Quota.check store.quota (-1) (String.length value) else @@ -398,7 +398,7 @@ let mkdir store perm path = let node, existing = get_deepest_existing_node store path in let owner = Node.get_owner node in (* It's upt to the mkdir logic to decide what to do with existing path *) - if not existing then Quota.check store.quota owner 0; + if not (existing || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; Quota.add_entry store.quota owner @@ -416,7 +416,7 @@ let setperms store perm path nperms = | Some node -> let old_owner = Node.get_owner node in let new_owner = Perms.Node.get_owner nperms in - if old_owner <> new_owner then Quota.check store.quota new_owner 0; + if not ((old_owner = new_owner) || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota new_owner 0; store.root <- path_setperms store perm path nperms; Quota.del_entry store.quota old_owner; Quota.add_entry store.quota new_owner -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:01: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 1X3TL6-0003vP-Ce; Sat, 05 Jul 2014 17:01:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TL4-0003vD-FJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:26 +0000 Received: from [85.158.143.35:24340] by server-1.bemta-4.messagelabs.com id 84/D9-09496-56F28B35; Sat, 05 Jul 2014 17:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404579683!16027671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29974 invoked from network); 5 Jul 2014 17:01:24 -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; 5 Jul 2014 17:01:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TL1-0006WA-Q7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TL1-0003J5-OY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:23 +0000 Date: Sat, 05 Jul 2014 17:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: perform a 3-way merge of the quota after a 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 f9cff088f470b662df1ac31d1161b4f1870b8546 Author: Jerome Maloberti AuthorDate: Thu Jul 3 15:02:18 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 4 09:49:09 2014 +0100 oxenstored: perform a 3-way merge of the quota after a transaction At a beginning of a transaction, the quotas from the global store are duplicated and modified by the transaction. If during the transaction, an action associated to no transaction is concurrently executed, the quotas of the global store are updated, and then the updates are lost when the transaction merges. We fix this problem by keeping another copy of the quota at the beginning of the transaction, and performing a 3-way merge between the quotas from the transaction and the "original" copy of the quota onto the quota of the global store. Signed-off-by: Jerome Maloberti Signed-off-by: Euan Harris Acked-by: David Scott --- tools/ocaml/xenstored/quota.ml | 5 +++++ tools/ocaml/xenstored/store.ml | 13 +++++-------- tools/ocaml/xenstored/transaction.ml | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/ocaml/xenstored/quota.ml b/tools/ocaml/xenstored/quota.ml index c668302..e6953c6 100644 --- a/tools/ocaml/xenstored/quota.ml +++ b/tools/ocaml/xenstored/quota.ml @@ -81,3 +81,8 @@ let add_entry quota id = let add quota diff = Hashtbl.iter (fun id nb -> set_entry quota id (get_entry quota id + nb)) diff.cur + +let merge orig_quota mod_quota dest_quota = + Hashtbl.iter (fun id nb -> let diff = nb - (get_entry orig_quota id) in + if diff <> 0 then + set_entry dest_quota id ((get_entry dest_quota id) + diff)) mod_quota.cur diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index 3efe515..223ee21 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -188,20 +188,17 @@ let rec get_deepest_existing_node node = function with Not_found -> node, false let set_node rnode path nnode = - let quota = Quota.create () in - if !Quota.activate then Node.recurse (fun node -> Quota.add_entry quota (Node.get_owner node)) nnode; if path = [] then - nnode, quota + nnode else let set_node node name = try let ent = Node.find node name in - if !Quota.activate then Node.recurse (fun node -> Quota.del_entry quota (Node.get_owner node)) ent; Node.replace_child node ent nnode with Not_found -> Node.add_child node nnode in - apply_modify rnode path set_node, quota + apply_modify rnode path set_node (* read | ls | getperms use this *) let rec lookup node path fct = @@ -375,10 +372,10 @@ let dump_buffer store = dump_store_buf store.root (* modifying functions with quota udpate *) -let set_node store path node = - let root, quota_diff = Path.set_node store.root path node in +let set_node store path node orig_quota mod_quota = + let root = Path.set_node store.root path node in store.root <- root; - Quota.add store.quota quota_diff + Quota.merge orig_quota mod_quota store.quota let write store perm path value = let node, existing = get_deepest_existing_node store path in diff --git a/tools/ocaml/xenstored/transaction.ml b/tools/ocaml/xenstored/transaction.ml index e59d681..77de4e8 100644 --- a/tools/ocaml/xenstored/transaction.ml +++ b/tools/ocaml/xenstored/transaction.ml @@ -74,6 +74,7 @@ type ty = No | Full of (int * Store.Node.t * Store.t) type t = { ty: ty; store: Store.t; + quota: Quota.t; mutable ops: (Xenbus.Xb.Op.operation * Store.Path.t) list; mutable read_lowpath: Store.Path.t option; mutable write_lowpath: Store.Path.t option; @@ -84,6 +85,7 @@ let make id store = { ty = ty; store = if id = none then store else Store.copy store; + quota = Quota.copy store.Store.quota; ops = []; read_lowpath = None; write_lowpath = None; @@ -155,7 +157,7 @@ let commit ~con t = (* it has to be in the store, otherwise it means bugs in the lowpath registration. we don't need to handle none. *) - maybe (fun n -> Store.set_node cstore p n) n; + maybe (fun n -> Store.set_node cstore p n t.quota store.Store.quota) n; Logging.write_coalesce ~tid:(get_id t) ~con (Store.Path.to_string p); ) t.write_lowpath; maybe (fun p -> -- generated by git-patchbot for /home/xen/git/xen.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 Jul 05 17:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 05 Jul 2014 17:01: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 1X3TL6-0003vP-Ce; Sat, 05 Jul 2014 17:01:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TL4-0003vD-FJ for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:26 +0000 Received: from [85.158.143.35:24340] by server-1.bemta-4.messagelabs.com id 84/D9-09496-56F28B35; Sat, 05 Jul 2014 17:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404579683!16027671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29974 invoked from network); 5 Jul 2014 17:01:24 -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; 5 Jul 2014 17:01:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X3TL1-0006WA-Q7 for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X3TL1-0003J5-OY for xen-changelog@lists.xensource.com; Sat, 05 Jul 2014 17:01:23 +0000 Date: Sat, 05 Jul 2014 17:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: perform a 3-way merge of the quota after a 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 f9cff088f470b662df1ac31d1161b4f1870b8546 Author: Jerome Maloberti AuthorDate: Thu Jul 3 15:02:18 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 4 09:49:09 2014 +0100 oxenstored: perform a 3-way merge of the quota after a transaction At a beginning of a transaction, the quotas from the global store are duplicated and modified by the transaction. If during the transaction, an action associated to no transaction is concurrently executed, the quotas of the global store are updated, and then the updates are lost when the transaction merges. We fix this problem by keeping another copy of the quota at the beginning of the transaction, and performing a 3-way merge between the quotas from the transaction and the "original" copy of the quota onto the quota of the global store. Signed-off-by: Jerome Maloberti Signed-off-by: Euan Harris Acked-by: David Scott --- tools/ocaml/xenstored/quota.ml | 5 +++++ tools/ocaml/xenstored/store.ml | 13 +++++-------- tools/ocaml/xenstored/transaction.ml | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/ocaml/xenstored/quota.ml b/tools/ocaml/xenstored/quota.ml index c668302..e6953c6 100644 --- a/tools/ocaml/xenstored/quota.ml +++ b/tools/ocaml/xenstored/quota.ml @@ -81,3 +81,8 @@ let add_entry quota id = let add quota diff = Hashtbl.iter (fun id nb -> set_entry quota id (get_entry quota id + nb)) diff.cur + +let merge orig_quota mod_quota dest_quota = + Hashtbl.iter (fun id nb -> let diff = nb - (get_entry orig_quota id) in + if diff <> 0 then + set_entry dest_quota id ((get_entry dest_quota id) + diff)) mod_quota.cur diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index 3efe515..223ee21 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -188,20 +188,17 @@ let rec get_deepest_existing_node node = function with Not_found -> node, false let set_node rnode path nnode = - let quota = Quota.create () in - if !Quota.activate then Node.recurse (fun node -> Quota.add_entry quota (Node.get_owner node)) nnode; if path = [] then - nnode, quota + nnode else let set_node node name = try let ent = Node.find node name in - if !Quota.activate then Node.recurse (fun node -> Quota.del_entry quota (Node.get_owner node)) ent; Node.replace_child node ent nnode with Not_found -> Node.add_child node nnode in - apply_modify rnode path set_node, quota + apply_modify rnode path set_node (* read | ls | getperms use this *) let rec lookup node path fct = @@ -375,10 +372,10 @@ let dump_buffer store = dump_store_buf store.root (* modifying functions with quota udpate *) -let set_node store path node = - let root, quota_diff = Path.set_node store.root path node in +let set_node store path node orig_quota mod_quota = + let root = Path.set_node store.root path node in store.root <- root; - Quota.add store.quota quota_diff + Quota.merge orig_quota mod_quota store.quota let write store perm path value = let node, existing = get_deepest_existing_node store path in diff --git a/tools/ocaml/xenstored/transaction.ml b/tools/ocaml/xenstored/transaction.ml index e59d681..77de4e8 100644 --- a/tools/ocaml/xenstored/transaction.ml +++ b/tools/ocaml/xenstored/transaction.ml @@ -74,6 +74,7 @@ type ty = No | Full of (int * Store.Node.t * Store.t) type t = { ty: ty; store: Store.t; + quota: Quota.t; mutable ops: (Xenbus.Xb.Op.operation * Store.Path.t) list; mutable read_lowpath: Store.Path.t option; mutable write_lowpath: Store.Path.t option; @@ -84,6 +85,7 @@ let make id store = { ty = ty; store = if id = none then store else Store.copy store; + quota = Quota.copy store.Store.quota; ops = []; read_lowpath = None; write_lowpath = None; @@ -155,7 +157,7 @@ let commit ~con t = (* it has to be in the store, otherwise it means bugs in the lowpath registration. we don't need to handle none. *) - maybe (fun n -> Store.set_node cstore p n) n; + maybe (fun n -> Store.set_node cstore p n t.quota store.Store.quota) n; Logging.write_coalesce ~tid:(get_id t) ~con (Store.Path.to_string p); ) t.write_lowpath; maybe (fun p -> -- generated by git-patchbot for /home/xen/git/xen.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 Jul 10 05:33:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05:33: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 1X56yh-0002lF-A0; Thu, 10 Jul 2014 05:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yg-0002l6-1b for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:06 +0000 Received: from [85.158.143.35:38343] by server-3.bemta-4.messagelabs.com id 45/57-16194-1952EB35; Thu, 10 Jul 2014 05:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404970384!16950160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5397 invoked from network); 10 Jul 2014 05:33: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; 10 Jul 2014 05:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yd-000776-M9 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yd-00045C-Cr for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:03 +0000 Date: Thu, 10 Jul 2014 05:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: ignore zero sized memory banks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9559d3d04d6be3a298f763dd68bbe7452c1f317d Author: Ian Campbell AuthorDate: Mon Jun 30 16:38:20 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 13:34:56 2014 +0100 xen: arm: ignore zero sized memory banks At least one platform (xgene) has a memory node which contains 4 banks, 3 of which are all zeroes. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/common/device_tree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 310635e..53f779a 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -322,6 +322,8 @@ static void __init process_memory_node(const void *fdt, int node, for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) { device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( !size ) + continue; early_info.mem.bank[early_info.mem.nr_banks].start = start; early_info.mem.bank[early_info.mem.nr_banks].size = size; early_info.mem.nr_banks++; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 10 05:33:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05:33: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 1X56yh-0002lF-A0; Thu, 10 Jul 2014 05:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yg-0002l6-1b for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:06 +0000 Received: from [85.158.143.35:38343] by server-3.bemta-4.messagelabs.com id 45/57-16194-1952EB35; Thu, 10 Jul 2014 05:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1404970384!16950160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5397 invoked from network); 10 Jul 2014 05:33: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; 10 Jul 2014 05:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yd-000776-M9 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yd-00045C-Cr for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:03 +0000 Date: Thu, 10 Jul 2014 05:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: ignore zero sized memory banks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9559d3d04d6be3a298f763dd68bbe7452c1f317d Author: Ian Campbell AuthorDate: Mon Jun 30 16:38:20 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 13:34:56 2014 +0100 xen: arm: ignore zero sized memory banks At least one platform (xgene) has a memory node which contains 4 banks, 3 of which are all zeroes. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/common/device_tree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 310635e..53f779a 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -322,6 +322,8 @@ static void __init process_memory_node(const void *fdt, int node, for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) { device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( !size ) + continue; early_info.mem.bank[early_info.mem.nr_banks].start = start; early_info.mem.bank[early_info.mem.nr_banks].size = size; early_info.mem.nr_banks++; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 10 05:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05: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 1X56ys-0002mK-DR; Thu, 10 Jul 2014 05: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 1X56yr-0002m8-92 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:17 +0000 Received: from [85.158.137.68:3993] by server-8.bemta-3.messagelabs.com id C1/A5-00810-C952EB35; Thu, 10 Jul 2014 05:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404970394!14996136!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18491 invoked from network); 10 Jul 2014 05:33:15 -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; 10 Jul 2014 05:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yn-00077C-RO for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yn-00045a-Oq for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:13 +0000 Date: Thu, 10 Jul 2014 05:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce accessors for GICv2 MMIO reads/writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 615773aee88b90a48446cd73796d18fb901d99be Author: Ian Campbell AuthorDate: Wed Jul 9 13:30:53 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 14:15:28 2014 +0100 xen/arm: Introduce accessors for GICv2 MMIO reads/writes A future patch needs to make the accesses to GICC more complex. For consistency introduce read/write wrappers for all three regions (GICD, GICC, GICH). Signed-off-by: Ian Campbell Cc: Vijaya Kumar K Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 157 +++++++++++++++++++++++++++++-------------------- 1 files changed, 94 insertions(+), 63 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index cc60af8..2795635 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -60,16 +60,12 @@ #define GICH_V2_VMCR_PRIORITY_MASK 0x1f #define GICH_V2_VMCR_PRIORITY_SHIFT 27 -#define GICD (gicv2.map_dbase) -#define GICC (gicv2.map_cbase) -#define GICH (gicv2.map_hbase) - /* Global state */ static struct { paddr_t dbase; /* Address of distributor registers */ void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers */ paddr_t hbase; /* Address of virtual interface registers */ void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ @@ -87,6 +83,41 @@ static DEFINE_PER_CPU(u8, gic_cpu_id); /* Maximum cpu interface per GIC */ #define NR_GIC_CPU_IF 8 +static inline void writeb_gicd(uint8_t val, unsigned int offset) +{ + writeb_relaxed(val, gicv2.map_dbase + offset); +} + +static inline void writel_gicd(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_dbase + offset); +} + +static inline uint32_t readl_gicd(unsigned int offset) +{ + return readl_relaxed(gicv2.map_dbase + offset); +} + +static inline void writel_gicc(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_cbase + offset); +} + +static inline uint32_t readl_gicc(unsigned int offset) +{ + return readl_relaxed(gicv2.map_cbase + offset); +} + +static inline void writel_gich(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_hbase + offset); +} + +static inline uint32_t readl_gich(int unsigned offset) +{ + return readl_relaxed(gicv2.map_hbase + offset); +} + static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) { unsigned int cpu; @@ -112,12 +143,12 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic.v2.lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); - v->arch.gic.v2.apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic.v2.vmcr = readl_relaxed(GICH + GICH_VMCR); + v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); /* Disable until next VCPU scheduled */ - writel_relaxed(0, GICH + GICH_HCR); + writel_gich(0, GICH_HCR); } static void gicv2_restore_state(const struct vcpu *v) @@ -125,11 +156,11 @@ static void gicv2_restore_state(const struct vcpu *v) int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_relaxed(v->arch.gic.v2.lr[i], GICH + GICH_LR + i * 4); + writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); - writel_relaxed(v->arch.gic.v2.apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic.v2.vmcr, GICH + GICH_VMCR); - writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); + writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); + writel_gich(GICH_HCR_EN, GICH_HCR); } static void gicv2_dump_state(const struct vcpu *v) @@ -140,7 +171,7 @@ static void gicv2_dump_state(const struct vcpu *v) { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) printk(" HW_LR[%d]=%x\n", i, - readl_relaxed(GICH + GICH_LR + i * 4)); + readl_gich(GICH_LR + i * 4)); } else { @@ -153,18 +184,18 @@ static void gicv2_eoi_irq(struct irq_desc *irqd) { int irq = irqd->irq; /* Lower the priority */ - writel_relaxed(irq, GICC + GICC_EOIR); + writel_gicc(irq, GICC_EOIR); } static void gicv2_dir_irq(struct irq_desc *irqd) { /* Deactivate */ - writel_relaxed(irqd->irq, GICC + GICC_DIR); + writel_gicc(irqd->irq, GICC_DIR); } static unsigned int gicv2_read_irq(void) { - return (readl_relaxed(GICC + GICC_IAR) & GICC_IA_IRQ); + return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); } /* @@ -185,18 +216,18 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, spin_lock(&gicv2.lock); /* Set edge / level */ - cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); + cfg = readl_gicd(GICD_ICFGR + (irq / 16) * 4); edgebit = 2u << (2 * (irq % 16)); if ( type & DT_IRQ_TYPE_LEVEL_MASK ) cfg &= ~edgebit; else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) cfg |= edgebit; - writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); + writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); + writeb_gicd(mask, GICD_ITARGETSR + irq); /* Set priority */ - writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + writeb_gicd(priority, GICD_IPRIORITYR + irq); spin_unlock(&gicv2.lock); } @@ -208,79 +239,79 @@ static void __init gicv2_dist_init(void) uint32_t gic_cpus; int i; - cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; /* Disable the distributor */ - writel_relaxed(0, GICD + GICD_CTLR); + writel_gicd(0, GICD_CTLR); - type = readl_relaxed(GICD + GICD_TYPER); + type = readl_gicd(GICD_TYPER); gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", - readl_relaxed(GICD + GICD_IIDR)); + readl_gicd(GICD_IIDR)); /* Default all global IRQs to level, active low */ for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) - writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); + writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); + writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); /* Disable all global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) - writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); + writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); /* Turn on the distributor */ - writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); + writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } static void __cpuinit gicv2_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ - writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ - writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */ + writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */ /* Set SGI priorities */ for ( i = 0; i < 16; i += 4 ) - writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | - GIC_PRI_IPI << 8 | GIC_PRI_IPI, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD_IPRIORITYR + (i / 4) * 4); /* Set PPI priorities */ for ( i = 16; i < 32; i += 4 ) - writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); /* Local settings: interface controller */ /* Don't mask by priority */ - writel_relaxed(0xff, GICC + GICC_PMR); + writel_gicc(0xff, GICC_PMR); /* Finest granularity of priority */ - writel_relaxed(0x0, GICC + GICC_BPR); + writel_gicc(0x0, GICC_BPR); /* Turn on delivery */ - writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); + writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); } static void gicv2_cpu_disable(void) { - writel_relaxed(0x0, GICC + GICC_CTLR); + writel_gicc(0x0, GICC_CTLR); } static void __cpuinit gicv2_hyp_init(void) @@ -288,16 +319,16 @@ static void __cpuinit gicv2_hyp_init(void) uint32_t vtr; uint8_t nr_lrs; - vtr = readl_relaxed(GICH + GICH_VTR); + vtr = readl_gich(GICH_VTR); nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; gicv2_info.nr_lrs = nr_lrs; - writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); + writel_gich(GICH_MISR_EOI, GICH_MISR); } static void __cpuinit gicv2_hyp_disable(void) { - writel_relaxed(0, GICH + GICH_HCR); + writel_gich(0, GICH_HCR); } static int gicv2_secondary_cpu_init(void) @@ -321,17 +352,17 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, switch ( irqmode ) { case SGI_TARGET_OTHERS: - writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_OTHERS | sgi, GICD_SGIR); break; case SGI_TARGET_SELF: - writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_SELF | sgi, GICD_SGIR); break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); mask = gicv2_cpu_mask(&online_mask); - writel_relaxed(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, - GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD_SGIR); break; default: BUG(); @@ -364,12 +395,12 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) << GICH_V2_LR_PHYSICAL_SHIFT); - writel_relaxed(lr_reg, GICH + GICH_LR + lr * 4); + writel_gich(lr_reg, GICH_LR + lr * 4); } static void gicv2_clear_lr(int lr) { - writel_relaxed(0, GICH + GICH_LR + lr * 4); + writel_gich(0, GICH_LR + lr * 4); } static int gicv2v_setup(struct domain *d) @@ -422,7 +453,7 @@ static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) { uint32_t lrv; - lrv = readl_relaxed(GICH + GICH_LR + lr * 4); + lrv = readl_gich(GICH_LR + lr * 4); lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; @@ -445,30 +476,30 @@ static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) << GICH_V2_LR_HW_SHIFT) | ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); - writel_relaxed(lrv, GICH + GICH_LR + lr * 4); + writel_gich(lrv, GICH_LR + lr * 4); } static void gicv2_hcr_status(uint32_t flag, bool_t status) { - uint32_t hcr = readl_relaxed(GICH + GICH_HCR); + uint32_t hcr = readl_gich(GICH_HCR); if ( status ) hcr |= flag; else hcr &= (~flag); - writel_relaxed(hcr, GICH + GICH_HCR); + writel_gich(hcr, GICH_HCR); } static unsigned int gicv2_read_vmcr_priority(void) { - return ((readl_relaxed(GICH + GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) & GICH_V2_VMCR_PRIORITY_MASK); } static unsigned int gicv2_read_apr(int apr_reg) { - return readl_relaxed(GICH + GICH_APR); + return readl_gich(GICH_APR); } static void gicv2_irq_enable(struct irq_desc *desc) @@ -482,7 +513,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) desc->status &= ~IRQ_DISABLED; dsb(sy); /* Enable routing */ - writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); + writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); spin_unlock_irqrestore(&gicv2.lock, flags); } @@ -495,7 +526,7 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gicv2.lock, flags); /* Disable routing */ - writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); + writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); desc->status |= IRQ_DISABLED; spin_unlock_irqrestore(&gicv2.lock, 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 Jul 10 05:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05: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 1X56ys-0002mK-DR; Thu, 10 Jul 2014 05: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 1X56yr-0002m8-92 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:17 +0000 Received: from [85.158.137.68:3993] by server-8.bemta-3.messagelabs.com id C1/A5-00810-C952EB35; Thu, 10 Jul 2014 05:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1404970394!14996136!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18491 invoked from network); 10 Jul 2014 05:33:15 -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; 10 Jul 2014 05:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yn-00077C-RO for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yn-00045a-Oq for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:13 +0000 Date: Thu, 10 Jul 2014 05:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce accessors for GICv2 MMIO reads/writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 615773aee88b90a48446cd73796d18fb901d99be Author: Ian Campbell AuthorDate: Wed Jul 9 13:30:53 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 14:15:28 2014 +0100 xen/arm: Introduce accessors for GICv2 MMIO reads/writes A future patch needs to make the accesses to GICC more complex. For consistency introduce read/write wrappers for all three regions (GICD, GICC, GICH). Signed-off-by: Ian Campbell Cc: Vijaya Kumar K Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 157 +++++++++++++++++++++++++++++-------------------- 1 files changed, 94 insertions(+), 63 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index cc60af8..2795635 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -60,16 +60,12 @@ #define GICH_V2_VMCR_PRIORITY_MASK 0x1f #define GICH_V2_VMCR_PRIORITY_SHIFT 27 -#define GICD (gicv2.map_dbase) -#define GICC (gicv2.map_cbase) -#define GICH (gicv2.map_hbase) - /* Global state */ static struct { paddr_t dbase; /* Address of distributor registers */ void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers*/ + void __iomem * map_cbase; /* IO mapped Address of CPU interface registers */ paddr_t hbase; /* Address of virtual interface registers */ void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ @@ -87,6 +83,41 @@ static DEFINE_PER_CPU(u8, gic_cpu_id); /* Maximum cpu interface per GIC */ #define NR_GIC_CPU_IF 8 +static inline void writeb_gicd(uint8_t val, unsigned int offset) +{ + writeb_relaxed(val, gicv2.map_dbase + offset); +} + +static inline void writel_gicd(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_dbase + offset); +} + +static inline uint32_t readl_gicd(unsigned int offset) +{ + return readl_relaxed(gicv2.map_dbase + offset); +} + +static inline void writel_gicc(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_cbase + offset); +} + +static inline uint32_t readl_gicc(unsigned int offset) +{ + return readl_relaxed(gicv2.map_cbase + offset); +} + +static inline void writel_gich(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_hbase + offset); +} + +static inline uint32_t readl_gich(int unsigned offset) +{ + return readl_relaxed(gicv2.map_hbase + offset); +} + static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) { unsigned int cpu; @@ -112,12 +143,12 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic.v2.lr[i] = readl_relaxed(GICH + GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); - v->arch.gic.v2.apr = readl_relaxed(GICH + GICH_APR); - v->arch.gic.v2.vmcr = readl_relaxed(GICH + GICH_VMCR); + v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); /* Disable until next VCPU scheduled */ - writel_relaxed(0, GICH + GICH_HCR); + writel_gich(0, GICH_HCR); } static void gicv2_restore_state(const struct vcpu *v) @@ -125,11 +156,11 @@ static void gicv2_restore_state(const struct vcpu *v) int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_relaxed(v->arch.gic.v2.lr[i], GICH + GICH_LR + i * 4); + writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); - writel_relaxed(v->arch.gic.v2.apr, GICH + GICH_APR); - writel_relaxed(v->arch.gic.v2.vmcr, GICH + GICH_VMCR); - writel_relaxed(GICH_HCR_EN, GICH + GICH_HCR); + writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); + writel_gich(GICH_HCR_EN, GICH_HCR); } static void gicv2_dump_state(const struct vcpu *v) @@ -140,7 +171,7 @@ static void gicv2_dump_state(const struct vcpu *v) { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) printk(" HW_LR[%d]=%x\n", i, - readl_relaxed(GICH + GICH_LR + i * 4)); + readl_gich(GICH_LR + i * 4)); } else { @@ -153,18 +184,18 @@ static void gicv2_eoi_irq(struct irq_desc *irqd) { int irq = irqd->irq; /* Lower the priority */ - writel_relaxed(irq, GICC + GICC_EOIR); + writel_gicc(irq, GICC_EOIR); } static void gicv2_dir_irq(struct irq_desc *irqd) { /* Deactivate */ - writel_relaxed(irqd->irq, GICC + GICC_DIR); + writel_gicc(irqd->irq, GICC_DIR); } static unsigned int gicv2_read_irq(void) { - return (readl_relaxed(GICC + GICC_IAR) & GICC_IA_IRQ); + return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); } /* @@ -185,18 +216,18 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, spin_lock(&gicv2.lock); /* Set edge / level */ - cfg = readl_relaxed(GICD + GICD_ICFGR + (irq / 16) * 4); + cfg = readl_gicd(GICD_ICFGR + (irq / 16) * 4); edgebit = 2u << (2 * (irq % 16)); if ( type & DT_IRQ_TYPE_LEVEL_MASK ) cfg &= ~edgebit; else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) cfg |= edgebit; - writel_relaxed(cfg, GICD + GICD_ICFGR + (irq / 16) * 4); + writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_relaxed(mask, GICD + GICD_ITARGETSR + irq); + writeb_gicd(mask, GICD_ITARGETSR + irq); /* Set priority */ - writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + writeb_gicd(priority, GICD_IPRIORITYR + irq); spin_unlock(&gicv2.lock); } @@ -208,79 +239,79 @@ static void __init gicv2_dist_init(void) uint32_t gic_cpus; int i; - cpumask = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; /* Disable the distributor */ - writel_relaxed(0, GICD + GICD_CTLR); + writel_gicd(0, GICD_CTLR); - type = readl_relaxed(GICD + GICD_TYPER); + type = readl_gicd(GICD_TYPER); gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", - readl_relaxed(GICD + GICD_IIDR)); + readl_gicd(GICD_IIDR)); /* Default all global IRQs to level, active low */ for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) - writel_relaxed(0x0, GICD + GICD_ICFGR + (i / 16) * 4); + writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_relaxed(cpumask, GICD + GICD_ITARGETSR + (i / 4) * 4); + writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_relaxed (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); /* Disable all global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) - writel_relaxed(~0x0, GICD + GICD_ICENABLER + (i / 32) * 4); + writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); /* Turn on the distributor */ - writel_relaxed(GICD_CTL_ENABLE, GICD + GICD_CTLR); + writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } static void __cpuinit gicv2_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = readl_relaxed(GICD + GICD_ITARGETSR) & 0xff; + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ - writel_relaxed(0xffff0000, GICD + GICD_ICENABLER); /* Disable all PPI */ - writel_relaxed(0x0000ffff, GICD + GICD_ISENABLER); /* Enable all SGI */ + writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */ + writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */ /* Set SGI priorities */ for ( i = 0; i < 16; i += 4 ) - writel_relaxed(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | - GIC_PRI_IPI << 8 | GIC_PRI_IPI, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD_IPRIORITYR + (i / 4) * 4); /* Set PPI priorities */ for ( i = 16; i < 32; i += 4 ) - writel_relaxed(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | - GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, - GICD + GICD_IPRIORITYR + (i / 4) * 4); + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); /* Local settings: interface controller */ /* Don't mask by priority */ - writel_relaxed(0xff, GICC + GICC_PMR); + writel_gicc(0xff, GICC_PMR); /* Finest granularity of priority */ - writel_relaxed(0x0, GICC + GICC_BPR); + writel_gicc(0x0, GICC_BPR); /* Turn on delivery */ - writel_relaxed(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC + GICC_CTLR); + writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); } static void gicv2_cpu_disable(void) { - writel_relaxed(0x0, GICC + GICC_CTLR); + writel_gicc(0x0, GICC_CTLR); } static void __cpuinit gicv2_hyp_init(void) @@ -288,16 +319,16 @@ static void __cpuinit gicv2_hyp_init(void) uint32_t vtr; uint8_t nr_lrs; - vtr = readl_relaxed(GICH + GICH_VTR); + vtr = readl_gich(GICH_VTR); nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; gicv2_info.nr_lrs = nr_lrs; - writel_relaxed(GICH_MISR_EOI, GICH + GICH_MISR); + writel_gich(GICH_MISR_EOI, GICH_MISR); } static void __cpuinit gicv2_hyp_disable(void) { - writel_relaxed(0, GICH + GICH_HCR); + writel_gich(0, GICH_HCR); } static int gicv2_secondary_cpu_init(void) @@ -321,17 +352,17 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, switch ( irqmode ) { case SGI_TARGET_OTHERS: - writel_relaxed(GICD_SGI_TARGET_OTHERS | sgi, GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_OTHERS | sgi, GICD_SGIR); break; case SGI_TARGET_SELF: - writel_relaxed(GICD_SGI_TARGET_SELF | sgi, GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_SELF | sgi, GICD_SGIR); break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); mask = gicv2_cpu_mask(&online_mask); - writel_relaxed(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, - GICD + GICD_SGIR); + writel_gicd(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD_SGIR); break; default: BUG(); @@ -364,12 +395,12 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) << GICH_V2_LR_PHYSICAL_SHIFT); - writel_relaxed(lr_reg, GICH + GICH_LR + lr * 4); + writel_gich(lr_reg, GICH_LR + lr * 4); } static void gicv2_clear_lr(int lr) { - writel_relaxed(0, GICH + GICH_LR + lr * 4); + writel_gich(0, GICH_LR + lr * 4); } static int gicv2v_setup(struct domain *d) @@ -422,7 +453,7 @@ static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) { uint32_t lrv; - lrv = readl_relaxed(GICH + GICH_LR + lr * 4); + lrv = readl_gich(GICH_LR + lr * 4); lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; @@ -445,30 +476,30 @@ static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) << GICH_V2_LR_HW_SHIFT) | ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); - writel_relaxed(lrv, GICH + GICH_LR + lr * 4); + writel_gich(lrv, GICH_LR + lr * 4); } static void gicv2_hcr_status(uint32_t flag, bool_t status) { - uint32_t hcr = readl_relaxed(GICH + GICH_HCR); + uint32_t hcr = readl_gich(GICH_HCR); if ( status ) hcr |= flag; else hcr &= (~flag); - writel_relaxed(hcr, GICH + GICH_HCR); + writel_gich(hcr, GICH_HCR); } static unsigned int gicv2_read_vmcr_priority(void) { - return ((readl_relaxed(GICH + GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) & GICH_V2_VMCR_PRIORITY_MASK); } static unsigned int gicv2_read_apr(int apr_reg) { - return readl_relaxed(GICH + GICH_APR); + return readl_gich(GICH_APR); } static void gicv2_irq_enable(struct irq_desc *desc) @@ -482,7 +513,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) desc->status &= ~IRQ_DISABLED; dsb(sy); /* Enable routing */ - writel_relaxed((1u << (irq % 32)), GICD + GICD_ISENABLER + (irq / 32) * 4); + writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); spin_unlock_irqrestore(&gicv2.lock, flags); } @@ -495,7 +526,7 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gicv2.lock, flags); /* Disable routing */ - writel_relaxed(1u << (irq % 32), GICD + GICD_ICENABLER + (irq / 32) * 4); + writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); desc->status |= IRQ_DISABLED; spin_unlock_irqrestore(&gicv2.lock, 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 Jul 10 05:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05: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 1X56z1-0002nX-GA; Thu, 10 Jul 2014 05: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 1X56z0-0002nO-N9 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:26 +0000 Received: from [85.158.139.211:64182] by server-16.bemta-5.messagelabs.com id 8A/78-18862-6A52EB35; Thu, 10 Jul 2014 05:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404970404!14643153!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27914 invoked from network); 10 Jul 2014 05:33:25 -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; 10 Jul 2014 05:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yy-00077I-2C for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yx-00046f-Vq for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:24 +0000 Date: Thu, 10 Jul 2014 05:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix PLATFORM_QUIRK_GIC_64K_STRIDE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 757916970f6e18c3d6163708618770065732af2c Author: Ian Campbell AuthorDate: Wed Jul 9 13:30:54 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 14:15:28 2014 +0100 xen/arm: Fix PLATFORM_QUIRK_GIC_64K_STRIDE The patch "xen/arm: use ioremap to map gic-v2 registers" handled this quirk by mapping a 64K+1 page region, but the code continued to assume that GICC_DIR was at offset 0x1000 from the start of the mapping. Fix this by mapping both pages of the GICC space independently and adjusting the accessor function to use the correct page. Signed-off-by: Ian Campbell Cc: Vijaya Kumar K Cc: Pranavkumar Sawargaonkar Cc: Anup Patel Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 2795635..009307a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -65,7 +65,7 @@ static struct { paddr_t dbase; /* Address of distributor registers */ void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers */ + void __iomem * map_cbase[2]; /* IO mapped Address of CPU interface registers */ paddr_t hbase; /* Address of virtual interface registers */ void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ @@ -100,12 +100,16 @@ static inline uint32_t readl_gicd(unsigned int offset) static inline void writel_gicc(uint32_t val, unsigned int offset) { - writel_relaxed(val, gicv2.map_cbase + offset); + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + writel_relaxed(val, gicv2.map_cbase[page] + offset); } static inline uint32_t readl_gicc(unsigned int offset) { - return readl_relaxed(gicv2.map_cbase + offset); + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + return readl_relaxed(gicv2.map_cbase[page] + offset); } static inline void writel_gich(uint32_t val, unsigned int offset) @@ -665,12 +669,15 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) if ( !gicv2.map_dbase ) panic("GICv2: Failed to ioremap for GIC distributor\n"); + gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 0x10); + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE * 0x10, + PAGE_SIZE); else - gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 2); + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); - if ( !gicv2.map_cbase ) + if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) panic("GICv2: Failed to ioremap for GIC CPU interface\n"); gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_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 Thu Jul 10 05:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 10 Jul 2014 05: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 1X56z1-0002nX-GA; Thu, 10 Jul 2014 05: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 1X56z0-0002nO-N9 for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:26 +0000 Received: from [85.158.139.211:64182] by server-16.bemta-5.messagelabs.com id 8A/78-18862-6A52EB35; Thu, 10 Jul 2014 05:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1404970404!14643153!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27914 invoked from network); 10 Jul 2014 05:33:25 -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; 10 Jul 2014 05:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X56yy-00077I-2C for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X56yx-00046f-Vq for xen-changelog@lists.xensource.com; Thu, 10 Jul 2014 05:33:24 +0000 Date: Thu, 10 Jul 2014 05:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix PLATFORM_QUIRK_GIC_64K_STRIDE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 757916970f6e18c3d6163708618770065732af2c Author: Ian Campbell AuthorDate: Wed Jul 9 13:30:54 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 9 14:15:28 2014 +0100 xen/arm: Fix PLATFORM_QUIRK_GIC_64K_STRIDE The patch "xen/arm: use ioremap to map gic-v2 registers" handled this quirk by mapping a 64K+1 page region, but the code continued to assume that GICC_DIR was at offset 0x1000 from the start of the mapping. Fix this by mapping both pages of the GICC space independently and adjusting the accessor function to use the correct page. Signed-off-by: Ian Campbell Cc: Vijaya Kumar K Cc: Pranavkumar Sawargaonkar Cc: Anup Patel Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 2795635..009307a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -65,7 +65,7 @@ static struct { paddr_t dbase; /* Address of distributor registers */ void __iomem * map_dbase; /* IO mapped Address of distributor registers */ paddr_t cbase; /* Address of CPU interface registers */ - void __iomem * map_cbase; /* IO mapped Address of CPU interface registers */ + void __iomem * map_cbase[2]; /* IO mapped Address of CPU interface registers */ paddr_t hbase; /* Address of virtual interface registers */ void __iomem * map_hbase; /* IO Address of virtual interface registers */ paddr_t vbase; /* Address of virtual cpu interface registers */ @@ -100,12 +100,16 @@ static inline uint32_t readl_gicd(unsigned int offset) static inline void writel_gicc(uint32_t val, unsigned int offset) { - writel_relaxed(val, gicv2.map_cbase + offset); + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + writel_relaxed(val, gicv2.map_cbase[page] + offset); } static inline uint32_t readl_gicc(unsigned int offset) { - return readl_relaxed(gicv2.map_cbase + offset); + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + return readl_relaxed(gicv2.map_cbase[page] + offset); } static inline void writel_gich(uint32_t val, unsigned int offset) @@ -665,12 +669,15 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) if ( !gicv2.map_dbase ) panic("GICv2: Failed to ioremap for GIC distributor\n"); + gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 0x10); + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE * 0x10, + PAGE_SIZE); else - gicv2.map_cbase = ioremap_nocache(gicv2.cbase, PAGE_SIZE * 2); + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); - if ( !gicv2.map_cbase ) + if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) panic("GICv2: Failed to ioremap for GIC CPU interface\n"); gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_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 Fri Jul 11 02:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44: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 1X5Qoh-0004Ei-Gj; Fri, 11 Jul 2014 02: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 1X5Qog-0004Eb-Vy for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:07 +0000 Received: from [85.158.137.68:3973] by server-11.bemta-3.messagelabs.com id 7C/0F-12889-67F4FB35; Fri, 11 Jul 2014 02:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1405046644!15307222!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8879 invoked from network); 11 Jul 2014 02:44:05 -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; 11 Jul 2014 02:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qod-0003mJ-VD for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qod-0006Fj-L7 for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:03 +0000 Date: Fri, 11 Jul 2014 02:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_backend: introduce xenstore_read_uint64 and xenstore_read_fe_uint64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daac43237f02ccf70d7dd74433c58e002e205123 Author: Stefano Stabellini AuthorDate: Wed Dec 18 19:17:31 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Jul 7 15:47:51 2014 +0000 xen_backend: introduce xenstore_read_uint64 and xenstore_read_fe_uint64 Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell --- hw/xen/xen_backend.c | 18 ++++++++++++++++++ include/hw/xen/xen_backend.h | 2 ++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 197795f..c1d7ae5 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -112,6 +112,19 @@ int xenstore_read_int(const char *base, const char *node, int *ival) return rc; } +int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval) +{ + char *val; + int rc = -1; + + val = xenstore_read_str(base, node); + if (val && 1 == sscanf(val, "%"SCNu64, uval)) { + rc = 0; + } + g_free(val); + return rc; +} + int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const char *val) { return xenstore_write_str(xendev->be, node, val); @@ -147,6 +160,11 @@ int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival) return xenstore_read_int(xendev->fe, node, ival); } +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval) +{ + return xenstore_read_uint64(xendev->fe, node, uval); +} + /* ------------------------------------------------------------- */ const char *xenbus_strstate(enum xenbus_state state) diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 3b7d96d..3b4125e 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -74,6 +74,8 @@ char *xenstore_read_be_str(struct XenDevice *xendev, const char *node); int xenstore_read_be_int(struct XenDevice *xendev, const char *node, int *ival); char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node); int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival); +int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval); +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval); const char *xenbus_strstate(enum xenbus_state state); struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 11 02:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44: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 1X5Qoh-0004Ei-Gj; Fri, 11 Jul 2014 02: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 1X5Qog-0004Eb-Vy for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:07 +0000 Received: from [85.158.137.68:3973] by server-11.bemta-3.messagelabs.com id 7C/0F-12889-67F4FB35; Fri, 11 Jul 2014 02:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1405046644!15307222!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8879 invoked from network); 11 Jul 2014 02:44:05 -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; 11 Jul 2014 02:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qod-0003mJ-VD for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qod-0006Fj-L7 for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:03 +0000 Date: Fri, 11 Jul 2014 02:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_backend: introduce xenstore_read_uint64 and xenstore_read_fe_uint64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daac43237f02ccf70d7dd74433c58e002e205123 Author: Stefano Stabellini AuthorDate: Wed Dec 18 19:17:31 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Jul 7 15:47:51 2014 +0000 xen_backend: introduce xenstore_read_uint64 and xenstore_read_fe_uint64 Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell --- hw/xen/xen_backend.c | 18 ++++++++++++++++++ include/hw/xen/xen_backend.h | 2 ++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 197795f..c1d7ae5 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -112,6 +112,19 @@ int xenstore_read_int(const char *base, const char *node, int *ival) return rc; } +int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval) +{ + char *val; + int rc = -1; + + val = xenstore_read_str(base, node); + if (val && 1 == sscanf(val, "%"SCNu64, uval)) { + rc = 0; + } + g_free(val); + return rc; +} + int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const char *val) { return xenstore_write_str(xendev->be, node, val); @@ -147,6 +160,11 @@ int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival) return xenstore_read_int(xendev->fe, node, ival); } +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval) +{ + return xenstore_read_uint64(xendev->fe, node, uval); +} + /* ------------------------------------------------------------- */ const char *xenbus_strstate(enum xenbus_state state) diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 3b7d96d..3b4125e 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -74,6 +74,8 @@ char *xenstore_read_be_str(struct XenDevice *xendev, const char *node); int xenstore_read_be_int(struct XenDevice *xendev, const char *node, int *ival); char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node); int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival); +int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval); +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval); const char *xenbus_strstate(enum xenbus_state state); struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 11 02:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qor-0004Fh-Ky; Fri, 11 Jul 2014 02:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoq-0004FW-Oy for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:16 +0000 Received: from [85.158.139.211:19265] by server-1.bemta-5.messagelabs.com id 1D/BC-30932-08F4FB35; Fri, 11 Jul 2014 02:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1405046654!14857741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25675 invoked from network); 11 Jul 2014 02:44:15 -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; 11 Jul 2014 02:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoo-0003mN-5B for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qoo-0006G9-2i for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:14 +0000 Date: Fri, 11 Jul 2014 02:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: build on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e391c05701830f3decfa541924d2e9b9dedbd97e Author: Stefano Stabellini AuthorDate: Wed Dec 18 19:17:32 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Jul 7 15:47:57 2014 +0000 xen: build on ARM Collection of fixes to build QEMU with Xen support on ARM: - use xenstore_read_fe_uint64 to retrieve the page-ref (xenfb); - use xen_pfn_t instead of unsigned long in xenfb; - unsigned long/xenpfn_t in xen_remove_from_physmap; - in xen-mapcache.c use HOST_LONG_BITS to check for QEMU's address space size. Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell --- hw/display/xenfb.c | 18 ++++++++++-------- xen-hvm.c | 2 +- xen-mapcache.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 032eb7a..07ddc9d 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -93,10 +93,12 @@ struct XenFB { static int common_bind(struct common *c) { - int mfn; + uint64_t mfn; - if (xenstore_read_fe_int(&c->xendev, "page-ref", &mfn) == -1) + if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1) return -1; + assert(mfn == (xen_pfn_t)mfn); + if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1) return -1; @@ -107,7 +109,7 @@ static int common_bind(struct common *c) return -1; xen_be_bind_evtchn(&c->xendev); - xen_be_printf(&c->xendev, 1, "ring mfn %d, remote-port %d, local-port %d\n", + xen_be_printf(&c->xendev, 1, "ring mfn %"PRIx64", remote-port %d, local-port %d\n", mfn, c->xendev.remote_port, c->xendev.local_port); return 0; @@ -409,7 +411,7 @@ static void input_event(struct XenDevice *xendev) /* -------------------------------------------------------------------- */ -static void xenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src) +static void xenfb_copy_mfns(int mode, int count, xen_pfn_t *dst, void *src) { uint32_t *src32 = src; uint64_t *src64 = src; @@ -424,8 +426,8 @@ static int xenfb_map_fb(struct XenFB *xenfb) struct xenfb_page *page = xenfb->c.page; char *protocol = xenfb->c.xendev.protocol; int n_fbdirs; - unsigned long *pgmfns = NULL; - unsigned long *fbmfns = NULL; + xen_pfn_t *pgmfns = NULL; + xen_pfn_t *fbmfns = NULL; void *map, *pd; int mode, ret = -1; @@ -483,8 +485,8 @@ static int xenfb_map_fb(struct XenFB *xenfb) n_fbdirs = xenfb->fbpages * mode / 8; n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; - pgmfns = g_malloc0(sizeof(unsigned long) * n_fbdirs); - fbmfns = g_malloc0(sizeof(unsigned long) * xenfb->fbpages); + pgmfns = g_malloc0(sizeof(xen_pfn_t) * n_fbdirs); + fbmfns = g_malloc0(sizeof(xen_pfn_t) * xenfb->fbpages); xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd); map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom, diff --git a/xen-hvm.c b/xen-hvm.c index a64486c..8c69b34 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -376,7 +376,7 @@ static int xen_remove_from_physmap(XenIOState *state, start_addr >>= TARGET_PAGE_BITS; phys_offset >>= TARGET_PAGE_BITS; for (i = 0; i < size; i++) { - unsigned long idx = start_addr + i; + xen_pfn_t idx = start_addr + i; xen_pfn_t gpfn = phys_offset + i; rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); diff --git a/xen-mapcache.c b/xen-mapcache.c index eda914a..66da1a6 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -33,10 +33,10 @@ # define DPRINTF(fmt, ...) do { } while (0) #endif -#if defined(__i386__) +#if HOST_LONG_BITS == 32 # define MCACHE_BUCKET_SHIFT 16 # define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */ -#elif defined(__x86_64__) +#else # define MCACHE_BUCKET_SHIFT 20 # define MCACHE_MAX_SIZE (1UL<<35) /* 32GB Cap */ #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 11 02:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qor-0004Fh-Ky; Fri, 11 Jul 2014 02:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoq-0004FW-Oy for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:16 +0000 Received: from [85.158.139.211:19265] by server-1.bemta-5.messagelabs.com id 1D/BC-30932-08F4FB35; Fri, 11 Jul 2014 02:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1405046654!14857741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25675 invoked from network); 11 Jul 2014 02:44:15 -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; 11 Jul 2014 02:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoo-0003mN-5B for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qoo-0006G9-2i for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:14 +0000 Date: Fri, 11 Jul 2014 02:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: build on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e391c05701830f3decfa541924d2e9b9dedbd97e Author: Stefano Stabellini AuthorDate: Wed Dec 18 19:17:32 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Jul 7 15:47:57 2014 +0000 xen: build on ARM Collection of fixes to build QEMU with Xen support on ARM: - use xenstore_read_fe_uint64 to retrieve the page-ref (xenfb); - use xen_pfn_t instead of unsigned long in xenfb; - unsigned long/xenpfn_t in xen_remove_from_physmap; - in xen-mapcache.c use HOST_LONG_BITS to check for QEMU's address space size. Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell --- hw/display/xenfb.c | 18 ++++++++++-------- xen-hvm.c | 2 +- xen-mapcache.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 032eb7a..07ddc9d 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -93,10 +93,12 @@ struct XenFB { static int common_bind(struct common *c) { - int mfn; + uint64_t mfn; - if (xenstore_read_fe_int(&c->xendev, "page-ref", &mfn) == -1) + if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1) return -1; + assert(mfn == (xen_pfn_t)mfn); + if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1) return -1; @@ -107,7 +109,7 @@ static int common_bind(struct common *c) return -1; xen_be_bind_evtchn(&c->xendev); - xen_be_printf(&c->xendev, 1, "ring mfn %d, remote-port %d, local-port %d\n", + xen_be_printf(&c->xendev, 1, "ring mfn %"PRIx64", remote-port %d, local-port %d\n", mfn, c->xendev.remote_port, c->xendev.local_port); return 0; @@ -409,7 +411,7 @@ static void input_event(struct XenDevice *xendev) /* -------------------------------------------------------------------- */ -static void xenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src) +static void xenfb_copy_mfns(int mode, int count, xen_pfn_t *dst, void *src) { uint32_t *src32 = src; uint64_t *src64 = src; @@ -424,8 +426,8 @@ static int xenfb_map_fb(struct XenFB *xenfb) struct xenfb_page *page = xenfb->c.page; char *protocol = xenfb->c.xendev.protocol; int n_fbdirs; - unsigned long *pgmfns = NULL; - unsigned long *fbmfns = NULL; + xen_pfn_t *pgmfns = NULL; + xen_pfn_t *fbmfns = NULL; void *map, *pd; int mode, ret = -1; @@ -483,8 +485,8 @@ static int xenfb_map_fb(struct XenFB *xenfb) n_fbdirs = xenfb->fbpages * mode / 8; n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; - pgmfns = g_malloc0(sizeof(unsigned long) * n_fbdirs); - fbmfns = g_malloc0(sizeof(unsigned long) * xenfb->fbpages); + pgmfns = g_malloc0(sizeof(xen_pfn_t) * n_fbdirs); + fbmfns = g_malloc0(sizeof(xen_pfn_t) * xenfb->fbpages); xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd); map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom, diff --git a/xen-hvm.c b/xen-hvm.c index a64486c..8c69b34 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -376,7 +376,7 @@ static int xen_remove_from_physmap(XenIOState *state, start_addr >>= TARGET_PAGE_BITS; phys_offset >>= TARGET_PAGE_BITS; for (i = 0; i < size; i++) { - unsigned long idx = start_addr + i; + xen_pfn_t idx = start_addr + i; xen_pfn_t gpfn = phys_offset + i; rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); diff --git a/xen-mapcache.c b/xen-mapcache.c index eda914a..66da1a6 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -33,10 +33,10 @@ # define DPRINTF(fmt, ...) do { } while (0) #endif -#if defined(__i386__) +#if HOST_LONG_BITS == 32 # define MCACHE_BUCKET_SHIFT 16 # define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */ -#elif defined(__x86_64__) +#else # define MCACHE_BUCKET_SHIFT 20 # define MCACHE_MAX_SIZE (1UL<<35) /* 32GB Cap */ #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 11 02:44:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44: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 1X5Qp1-0004HO-No; Fri, 11 Jul 2014 02: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 1X5Qp0-0004HB-To for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:27 +0000 Received: from [193.109.254.147:5228] by server-9.bemta-14.messagelabs.com id 4D/F9-14237-A8F4FB35; Fri, 11 Jul 2014 02:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1405046664!16716018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28578 invoked from network); 11 Jul 2014 02:44: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 Jul 2014 02:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoy-0003mV-Ci for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qoy-0006GV-8U for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:24 +0000 Date: Fri, 11 Jul 2014 02:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] disas/libvixl: prepend the include path of libvixl header files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 978c62ba67704c6b93070aa467c8b31c0d07d1f9 Author: Stefano Stabellini AuthorDate: Mon Jul 7 16:25:07 2014 +0100 Commit: Stefano Stabellini CommitDate: Tue Jul 8 18:51:58 2014 +0000 disas/libvixl: prepend the include path of libvixl header files Currently the Makefile of disas/libvixl appends -I$(SRC_PATH)/disas/libvixl to QEMU_CFLAGS. As a consequence C++ files that #include "utils.h", such as disas/libvixl/a64/instructions-a64.cc, are going to look for utils.h on all the other include paths first. When building QEMU as part of the Xen make system, another unrelated utils.h file is going to be chosen for inclusion, causing a build failure: In file included from disas/libvixl/a64/instructions-a64.cc:27:0: /qemu/disas/libvixl/a64/instructions-a64.h:88:64: error: 'rawbits_to_float' was not declared in this scope const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000); Fix the problem by prepending (rather than appending) the libvixl include path to QEMU_CFLAGS. upstream-commit-id: 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- disas/libvixl/Makefile.objs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs index 0adb3ce..17e6565 100644 --- a/disas/libvixl/Makefile.objs +++ b/disas/libvixl/Makefile.objs @@ -3,6 +3,6 @@ libvixl_OBJS = utils.o \ a64/decoder-a64.o \ a64/disasm-a64.o -$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -I$(SRC_PATH)/disas/libvixl +$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 11 02:44:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Jul 2014 02:44: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 1X5Qp1-0004HO-No; Fri, 11 Jul 2014 02: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 1X5Qp0-0004HB-To for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:27 +0000 Received: from [193.109.254.147:5228] by server-9.bemta-14.messagelabs.com id 4D/F9-14237-A8F4FB35; Fri, 11 Jul 2014 02:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1405046664!16716018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28578 invoked from network); 11 Jul 2014 02:44: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 Jul 2014 02:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5Qoy-0003mV-Ci for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X5Qoy-0006GV-8U for xen-changelog@lists.xensource.com; Fri, 11 Jul 2014 02:44:24 +0000 Date: Fri, 11 Jul 2014 02:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] disas/libvixl: prepend the include path of libvixl header files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 978c62ba67704c6b93070aa467c8b31c0d07d1f9 Author: Stefano Stabellini AuthorDate: Mon Jul 7 16:25:07 2014 +0100 Commit: Stefano Stabellini CommitDate: Tue Jul 8 18:51:58 2014 +0000 disas/libvixl: prepend the include path of libvixl header files Currently the Makefile of disas/libvixl appends -I$(SRC_PATH)/disas/libvixl to QEMU_CFLAGS. As a consequence C++ files that #include "utils.h", such as disas/libvixl/a64/instructions-a64.cc, are going to look for utils.h on all the other include paths first. When building QEMU as part of the Xen make system, another unrelated utils.h file is going to be chosen for inclusion, causing a build failure: In file included from disas/libvixl/a64/instructions-a64.cc:27:0: /qemu/disas/libvixl/a64/instructions-a64.h:88:64: error: 'rawbits_to_float' was not declared in this scope const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000); Fix the problem by prepending (rather than appending) the libvixl include path to QEMU_CFLAGS. upstream-commit-id: 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- disas/libvixl/Makefile.objs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs index 0adb3ce..17e6565 100644 --- a/disas/libvixl/Makefile.objs +++ b/disas/libvixl/Makefile.objs @@ -3,6 +3,6 @@ libvixl_OBJS = utils.o \ a64/decoder-a64.o \ a64/disasm-a64.o -$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -I$(SRC_PATH)/disas/libvixl +$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLc-0005uz-Fd; Sun, 13 Jul 2014 19:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLb-0005ur-9y for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:07 +0000 Received: from [85.158.137.68:38426] by server-6.bemta-3.messagelabs.com id C5/0F-15862-E5CD2C35; Sun, 13 Jul 2014 19:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1405279324!15688713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27128 invoked from network); 13 Jul 2014 19:22:05 -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; 13 Jul 2014 19:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLY-0003Tc-D9 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLY-0007xH-63 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:04 +0000 Date: Sun, 13 Jul 2014 19:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update to seabios rel-1.7.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5973432f19a935422cf9032dbe5132bb1382eb61 Author: Ian Campbell AuthorDate: Thu Jun 26 11:45:49 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:34:19 2014 +0100 tools: update to seabios rel-1.7.5 Signed-off-by: Ian Campbell Tested-by: Don Slutz Acked-by: Ian Jackson --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index e7f14ef..ab95b1c 100644 --- a/Config.mk +++ b/Config.mk @@ -235,9 +235,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= master -SEABIOS_UPSTREAM_TAG ?= rel-1.7.4 -# Sun Dec 22 10:42:26 2013 -0500 -# coreboot: Make sure to print the SeaBIOS version in cbmem debug output. +SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 +# Thu May 22 16:59:16 2014 -0400 +# python3 fixes for vgabios and csm builds. ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLc-0005uz-Fd; Sun, 13 Jul 2014 19:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLb-0005ur-9y for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:07 +0000 Received: from [85.158.137.68:38426] by server-6.bemta-3.messagelabs.com id C5/0F-15862-E5CD2C35; Sun, 13 Jul 2014 19:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1405279324!15688713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27128 invoked from network); 13 Jul 2014 19:22:05 -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; 13 Jul 2014 19:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLY-0003Tc-D9 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLY-0007xH-63 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:04 +0000 Date: Sun, 13 Jul 2014 19:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update to seabios rel-1.7.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5973432f19a935422cf9032dbe5132bb1382eb61 Author: Ian Campbell AuthorDate: Thu Jun 26 11:45:49 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:34:19 2014 +0100 tools: update to seabios rel-1.7.5 Signed-off-by: Ian Campbell Tested-by: Don Slutz Acked-by: Ian Jackson --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index e7f14ef..ab95b1c 100644 --- a/Config.mk +++ b/Config.mk @@ -235,9 +235,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= master -SEABIOS_UPSTREAM_TAG ?= rel-1.7.4 -# Sun Dec 22 10:42:26 2013 -0500 -# coreboot: Make sure to print the SeaBIOS version in cbmem debug output. +SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 +# Thu May 22 16:59:16 2014 -0400 +# python3 fixes for vgabios and csm builds. ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLm-0005vl-JV; Sun, 13 Jul 2014 19:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLl-0005vb-R8 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:17 +0000 Received: from [85.158.137.68:29208] by server-16.bemta-3.messagelabs.com id 42/73-28986-96CD2C35; Sun, 13 Jul 2014 19:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279334!15628938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16249 invoked from network); 13 Jul 2014 19:22:15 -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; 13 Jul 2014 19:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLi-0003Tf-Ks for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLi-0007yD-Gv for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:14 +0000 Date: Sun, 13 Jul 2014 19:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: dump vcpu gic info in arch_dump_vcpu_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c3a60d25ea0f8cf1a6abf614c70a923ee7cb5e8 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:39 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:36:47 2014 +0100 xen: arm: dump vcpu gic info in arch_dump_vcpu_info Instead of looping over vcpus in arch_dump_domain_info Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 829d49f..bb5c810 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -747,12 +747,6 @@ int domain_relinquish_resources(struct domain *d) void arch_dump_domain_info(struct domain *d) { - struct vcpu *v; - - for_each_vcpu ( d, v ) - { - gic_dump_info(v); - } } @@ -775,6 +769,7 @@ long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) void arch_dump_vcpu_info(struct vcpu *v) { + gic_dump_info(v); } void vcpu_mark_events_pending(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 Sun Jul 13 19:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLm-0005vl-JV; Sun, 13 Jul 2014 19:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLl-0005vb-R8 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:17 +0000 Received: from [85.158.137.68:29208] by server-16.bemta-3.messagelabs.com id 42/73-28986-96CD2C35; Sun, 13 Jul 2014 19:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279334!15628938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16249 invoked from network); 13 Jul 2014 19:22:15 -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; 13 Jul 2014 19:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLi-0003Tf-Ks for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLi-0007yD-Gv for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:14 +0000 Date: Sun, 13 Jul 2014 19:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: dump vcpu gic info in arch_dump_vcpu_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c3a60d25ea0f8cf1a6abf614c70a923ee7cb5e8 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:39 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:36:47 2014 +0100 xen: arm: dump vcpu gic info in arch_dump_vcpu_info Instead of looping over vcpus in arch_dump_domain_info Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 829d49f..bb5c810 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -747,12 +747,6 @@ int domain_relinquish_resources(struct domain *d) void arch_dump_domain_info(struct domain *d) { - struct vcpu *v; - - for_each_vcpu ( d, v ) - { - gic_dump_info(v); - } } @@ -775,6 +769,7 @@ long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) void arch_dump_vcpu_info(struct vcpu *v) { + gic_dump_info(v); } void vcpu_mark_events_pending(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 Sun Jul 13 19:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLw-0005x5-Lz; Sun, 13 Jul 2014 19:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLv-0005wx-Lc for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:27 +0000 Received: from [85.158.137.68:29392] by server-2.bemta-3.messagelabs.com id 6B/AE-14008-27CD2C35; Sun, 13 Jul 2014 19:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1405279345!11234650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24746 invoked from network); 13 Jul 2014 19:22:26 -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; 13 Jul 2014 19:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLs-0003To-TM for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLs-0007yc-Oz for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:24 +0000 Date: Sun, 13 Jul 2014 19:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: pull min/max_t into xc_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 911a3042f3e80c74181361d1e8f11d386c100847 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:40 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:37:25 2014 +0100 tools/libxc: pull min/max_t into xc_private.h There are generally useful. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- tools/libxc/xc_dom_decompress_unsafe_xz.c | 5 ----- tools/libxc/xc_private.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom_decompress_unsafe_xz.c b/tools/libxc/xc_dom_decompress_unsafe_xz.c index 2a32d40..6be1f89 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_xz.c +++ b/tools/libxc/xc_dom_decompress_unsafe_xz.c @@ -40,11 +40,6 @@ static inline u32 le32_to_cpup(const u32 *p) (void) (&_x == &_y); \ _x < _y ? _x : _y; }) -#define min_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#define max_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) - #define __force #define always_inline diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 6cc0f2b..c240a7c 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -349,6 +349,11 @@ int xc_ffs16(uint16_t x); int xc_ffs32(uint32_t x); int xc_ffs64(uint64_t x); +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) +#define max_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) + #define DOMPRINTF(fmt, args...) xc_dom_printf(dom->xch, fmt, ## args) #define DOMPRINTF_CALLED(xch) xc_dom_printf((xch), "%s: called", __FUNCTION__) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PLw-0005x5-Lz; Sun, 13 Jul 2014 19:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLv-0005wx-Lc for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:27 +0000 Received: from [85.158.137.68:29392] by server-2.bemta-3.messagelabs.com id 6B/AE-14008-27CD2C35; Sun, 13 Jul 2014 19:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1405279345!11234650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24746 invoked from network); 13 Jul 2014 19:22:26 -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; 13 Jul 2014 19:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PLs-0003To-TM for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PLs-0007yc-Oz for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:24 +0000 Date: Sun, 13 Jul 2014 19:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: pull min/max_t into xc_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 911a3042f3e80c74181361d1e8f11d386c100847 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:40 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:37:25 2014 +0100 tools/libxc: pull min/max_t into xc_private.h There are generally useful. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- tools/libxc/xc_dom_decompress_unsafe_xz.c | 5 ----- tools/libxc/xc_private.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom_decompress_unsafe_xz.c b/tools/libxc/xc_dom_decompress_unsafe_xz.c index 2a32d40..6be1f89 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_xz.c +++ b/tools/libxc/xc_dom_decompress_unsafe_xz.c @@ -40,11 +40,6 @@ static inline u32 le32_to_cpup(const u32 *p) (void) (&_x == &_y); \ _x < _y ? _x : _y; }) -#define min_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#define max_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) - #define __force #define always_inline diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 6cc0f2b..c240a7c 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -349,6 +349,11 @@ int xc_ffs16(uint16_t x); int xc_ffs32(uint32_t x); int xc_ffs64(uint64_t x); +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) +#define max_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) + #define DOMPRINTF(fmt, args...) xc_dom_printf(dom->xch, fmt, ## args) #define DOMPRINTF_CALLED(xch) xc_dom_printf((xch), "%s: called", __FUNCTION__) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PM8-0005yk-Ou; Sun, 13 Jul 2014 19:22:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PM7-0005yW-1f for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:39 +0000 Received: from [85.158.143.35:19473] by server-3.bemta-4.messagelabs.com id F3/33-09960-E7CD2C35; Sun, 13 Jul 2014 19:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279355!10138561!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5664 invoked from network); 13 Jul 2014 19:22:36 -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; 13 Jul 2014 19:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PM3-0003Tw-5O for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PM3-0007z2-0g for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:35 +0000 Date: Sun, 13 Jul 2014 19:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: arm: allocate large pages to guests. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5305a316b4b73df6f48e42a9685744db086a3c3d Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:41 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:37:46 2014 +0100 tools: arm: allocate large pages to guests. Tries to allocate as many large (1G or 2M) pages as it can to the guest and tries to align to the next larger size on each attempt so that we can attempt to allocate even larger pages on the next iteration (this is currently only exercised via a compile time debug option, which is left in place under a #if 0). Since ARM page tables are consistent at each level there is a common helper function which tries to allocate a levels worth of pages. The exception to this consistency is level 0 which does not support table mappings (0.5TB superpages!). Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- tools/libxc/xc_dom_arm.c | 131 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 117 insertions(+), 14 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 10f6bcb..9b31b1f 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -30,6 +30,13 @@ #define CONSOLE_PFN_OFFSET 0 #define XENSTORE_PFN_OFFSET 1 +#define LPAE_SHIFT 9 + +#define PFN_4K_SHIFT (0) +#define PFN_2M_SHIFT (PFN_4K_SHIFT+LPAE_SHIFT) +#define PFN_1G_SHIFT (PFN_2M_SHIFT+LPAE_SHIFT) +#define PFN_512G_SHIFT (PFN_1G_SHIFT+LPAE_SHIFT) + /* get guest IO ABI protocol */ const char *xc_domain_get_native_protocol(xc_interface *xch, uint32_t domid) @@ -249,11 +256,72 @@ static int set_mode(xc_interface *xch, domid_t domid, char *guest_type) return rc; } +/* >0: success, *nr_pfns set to number actually populated + * 0: didn't try with this pfn shift (e.g. misaligned base etc) + * <0: ERROR + */ +static int populate_one_size(struct xc_dom_image *dom, int pfn_shift, + xen_pfn_t base_pfn, xen_pfn_t *nr_pfns, + xen_pfn_t *extents) +{ + /* The mask for this level */ + const uint64_t mask = ((uint64_t)1<<(pfn_shift))-1; + /* The shift, mask and next boundary for the level above this one */ + const int next_shift = pfn_shift + LPAE_SHIFT; + const uint64_t next_mask = ((uint64_t)1< next_boundary ) + end_pfn = next_boundary; + + count = ( end_pfn - base_pfn ) >> pfn_shift; + + /* Nothing to allocate */ + if ( !count ) + return 0; + + for ( i = 0 ; i < count ; i ++ ) + extents[i] = base_pfn + (i<xch, dom->guest_domid, count, + pfn_shift, 0, extents); + if ( nr <= 0 ) return nr; + DOMPRINTF("%s: populated %#x/%#x entries with shift %d", + __FUNCTION__, nr, count, pfn_shift); + + *nr_pfns = nr << pfn_shift; + + return 1; +} + static int populate_guest_memory(struct xc_dom_image *dom, xen_pfn_t base_pfn, xen_pfn_t nr_pfns) { - int rc; - xen_pfn_t allocsz, pfn; + int rc = 0; + xen_pfn_t allocsz, pfn, *extents; + + extents = calloc(1024*1024,sizeof(xen_pfn_t)); + if ( extents == NULL ) + { + DOMPRINTF("%s: Unable to allocate extent array", __FUNCTION__); + return -1; + } DOMPRINTF("%s: populating RAM @ %016"PRIx64"-%016"PRIx64" (%"PRId64"MB)", __FUNCTION__, @@ -261,21 +329,56 @@ static int populate_guest_memory(struct xc_dom_image *dom, (uint64_t)(base_pfn + nr_pfns) << XC_PAGE_SHIFT, (uint64_t)nr_pfns >> (20-XC_PAGE_SHIFT)); - for ( pfn = 0; pfn < nr_pfns; pfn++ ) - dom->p2m_host[pfn] = base_pfn + pfn; - - for ( pfn = rc = allocsz = 0; (pfn < nr_pfns) && !rc; pfn += allocsz ) + for ( pfn = 0; pfn < nr_pfns; pfn += allocsz ) { - allocsz = nr_pfns - pfn; - if ( allocsz > 1024*1024 ) - allocsz = 1024*1024; - - rc = xc_domain_populate_physmap_exact( - dom->xch, dom->guest_domid, allocsz, - 0, 0, &dom->p2m_host[pfn]); + allocsz = min_t(int, 1024*1024, nr_pfns - pfn); +#if 0 /* Enable this to exercise/debug the code which tries to realign + * to a superpage boundary, by misaligning at the start. */ + if ( pfn == 0 ) + { + allocsz = 1; + rc = populate_one_size(dom, PFN_4K_SHIFT, + base_pfn + pfn, &allocsz, extents); + if (rc < 0) break; + if (rc > 0) continue; + /* Failed to allocate a single page? */ + break; + } +#endif + + rc = populate_one_size(dom, PFN_512G_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_1G_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_2M_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_4K_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc == 0 ) + { + DOMPRINTF("%s: Not enough RAM", __FUNCTION__); + errno = ENOMEM; + rc = -1; + goto out; + } } - return rc; + for ( pfn = 0; pfn < nr_pfns; pfn++ ) + dom->p2m_host[pfn] = base_pfn + pfn; + +out: + free(extents); + return rc < 0 ? rc : 0; } int arch_setup_meminit(struct xc_dom_image *dom) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PM8-0005yk-Ou; Sun, 13 Jul 2014 19:22:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PM7-0005yW-1f for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:39 +0000 Received: from [85.158.143.35:19473] by server-3.bemta-4.messagelabs.com id F3/33-09960-E7CD2C35; Sun, 13 Jul 2014 19:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279355!10138561!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5664 invoked from network); 13 Jul 2014 19:22:36 -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; 13 Jul 2014 19:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PM3-0003Tw-5O for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PM3-0007z2-0g for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:35 +0000 Date: Sun, 13 Jul 2014 19:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: arm: allocate large pages to guests. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5305a316b4b73df6f48e42a9685744db086a3c3d Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:41 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:37:46 2014 +0100 tools: arm: allocate large pages to guests. Tries to allocate as many large (1G or 2M) pages as it can to the guest and tries to align to the next larger size on each attempt so that we can attempt to allocate even larger pages on the next iteration (this is currently only exercised via a compile time debug option, which is left in place under a #if 0). Since ARM page tables are consistent at each level there is a common helper function which tries to allocate a levels worth of pages. The exception to this consistency is level 0 which does not support table mappings (0.5TB superpages!). Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- tools/libxc/xc_dom_arm.c | 131 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 117 insertions(+), 14 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 10f6bcb..9b31b1f 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -30,6 +30,13 @@ #define CONSOLE_PFN_OFFSET 0 #define XENSTORE_PFN_OFFSET 1 +#define LPAE_SHIFT 9 + +#define PFN_4K_SHIFT (0) +#define PFN_2M_SHIFT (PFN_4K_SHIFT+LPAE_SHIFT) +#define PFN_1G_SHIFT (PFN_2M_SHIFT+LPAE_SHIFT) +#define PFN_512G_SHIFT (PFN_1G_SHIFT+LPAE_SHIFT) + /* get guest IO ABI protocol */ const char *xc_domain_get_native_protocol(xc_interface *xch, uint32_t domid) @@ -249,11 +256,72 @@ static int set_mode(xc_interface *xch, domid_t domid, char *guest_type) return rc; } +/* >0: success, *nr_pfns set to number actually populated + * 0: didn't try with this pfn shift (e.g. misaligned base etc) + * <0: ERROR + */ +static int populate_one_size(struct xc_dom_image *dom, int pfn_shift, + xen_pfn_t base_pfn, xen_pfn_t *nr_pfns, + xen_pfn_t *extents) +{ + /* The mask for this level */ + const uint64_t mask = ((uint64_t)1<<(pfn_shift))-1; + /* The shift, mask and next boundary for the level above this one */ + const int next_shift = pfn_shift + LPAE_SHIFT; + const uint64_t next_mask = ((uint64_t)1< next_boundary ) + end_pfn = next_boundary; + + count = ( end_pfn - base_pfn ) >> pfn_shift; + + /* Nothing to allocate */ + if ( !count ) + return 0; + + for ( i = 0 ; i < count ; i ++ ) + extents[i] = base_pfn + (i<xch, dom->guest_domid, count, + pfn_shift, 0, extents); + if ( nr <= 0 ) return nr; + DOMPRINTF("%s: populated %#x/%#x entries with shift %d", + __FUNCTION__, nr, count, pfn_shift); + + *nr_pfns = nr << pfn_shift; + + return 1; +} + static int populate_guest_memory(struct xc_dom_image *dom, xen_pfn_t base_pfn, xen_pfn_t nr_pfns) { - int rc; - xen_pfn_t allocsz, pfn; + int rc = 0; + xen_pfn_t allocsz, pfn, *extents; + + extents = calloc(1024*1024,sizeof(xen_pfn_t)); + if ( extents == NULL ) + { + DOMPRINTF("%s: Unable to allocate extent array", __FUNCTION__); + return -1; + } DOMPRINTF("%s: populating RAM @ %016"PRIx64"-%016"PRIx64" (%"PRId64"MB)", __FUNCTION__, @@ -261,21 +329,56 @@ static int populate_guest_memory(struct xc_dom_image *dom, (uint64_t)(base_pfn + nr_pfns) << XC_PAGE_SHIFT, (uint64_t)nr_pfns >> (20-XC_PAGE_SHIFT)); - for ( pfn = 0; pfn < nr_pfns; pfn++ ) - dom->p2m_host[pfn] = base_pfn + pfn; - - for ( pfn = rc = allocsz = 0; (pfn < nr_pfns) && !rc; pfn += allocsz ) + for ( pfn = 0; pfn < nr_pfns; pfn += allocsz ) { - allocsz = nr_pfns - pfn; - if ( allocsz > 1024*1024 ) - allocsz = 1024*1024; - - rc = xc_domain_populate_physmap_exact( - dom->xch, dom->guest_domid, allocsz, - 0, 0, &dom->p2m_host[pfn]); + allocsz = min_t(int, 1024*1024, nr_pfns - pfn); +#if 0 /* Enable this to exercise/debug the code which tries to realign + * to a superpage boundary, by misaligning at the start. */ + if ( pfn == 0 ) + { + allocsz = 1; + rc = populate_one_size(dom, PFN_4K_SHIFT, + base_pfn + pfn, &allocsz, extents); + if (rc < 0) break; + if (rc > 0) continue; + /* Failed to allocate a single page? */ + break; + } +#endif + + rc = populate_one_size(dom, PFN_512G_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_1G_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_2M_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc > 0 ) continue; + + rc = populate_one_size(dom, PFN_4K_SHIFT, + base_pfn + pfn, &allocsz, extents); + if ( rc < 0 ) break; + if ( rc == 0 ) + { + DOMPRINTF("%s: Not enough RAM", __FUNCTION__); + errno = ENOMEM; + rc = -1; + goto out; + } } - return rc; + for ( pfn = 0; pfn < nr_pfns; pfn++ ) + dom->p2m_host[pfn] = base_pfn + pfn; + +out: + free(extents); + return rc < 0 ? rc : 0; } int arch_setup_meminit(struct xc_dom_image *dom) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PMH-00060J-Rp; Sun, 13 Jul 2014 19:22:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMG-000600-6z for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:48 +0000 Received: from [85.158.139.211:64707] by server-9.bemta-5.messagelabs.com id 27/A4-14363-78CD2C35; Sun, 13 Jul 2014 19:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1405279365!15286666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14502 invoked from network); 13 Jul 2014 19:22:46 -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; 13 Jul 2014 19:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMD-0003U2-Bh for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMD-0007zP-9P for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:45 +0000 Date: Sun, 13 Jul 2014 19:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: only put_page for p2m operations which require it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a931087092db0a58e3ef4b1a4da47a9796d86f61 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:42 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:53 2014 +0100 xen: arm: only put_page for p2m operations which require it. In particular do not do it for CACHEFLUSH. INSERT, RELINQUISH and REMOVE should all put the page (if the current pte is valid). ALLOCATE doesn't need to since it asserts the current PTE must be invalid. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 9960e17..ea05b6d 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -299,6 +299,23 @@ enum p2m_operation { CACHEFLUSH, }; +static void p2m_put_page(const lpae_t pte) +{ + /* TODO: Handle other p2m types + * + * It's safe to do the put_page here because page_alloc will + * flush the TLBs if the page is reallocated before the end of + * this loop. + */ + if ( p2m_is_foreign(pte.p2m.type) ) + { + unsigned long mfn = pte.p2m.base; + + ASSERT(mfn_valid(mfn)); + put_page(mfn_to_page(mfn)); + } +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -400,20 +417,6 @@ static int apply_p2m_changes(struct domain *d, flush |= pte.p2m.valid; - /* TODO: Handle other p2m type - * - * It's safe to do the put_page here because page_alloc will - * flush the TLBs if the page is reallocated before the end of - * this loop. - */ - if ( pte.p2m.valid && p2m_is_foreign(pte.p2m.type) ) - { - unsigned long mfn = pte.p2m.base; - - ASSERT(mfn_valid(mfn)); - put_page(mfn_to_page(mfn)); - } - switch (op) { case ALLOCATE: { @@ -436,6 +439,8 @@ static int apply_p2m_changes(struct domain *d, break; case INSERT: { + if ( pte.p2m.valid ) + p2m_put_page(pte); pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr, t); p2m_write_pte(&third[third_table_offset(addr)], pte, flush_pt); @@ -451,6 +456,8 @@ static int apply_p2m_changes(struct domain *d, break; } + p2m_put_page(pte); + count += 0x10; memset(&pte, 0x00, sizeof(pte)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PMH-00060J-Rp; Sun, 13 Jul 2014 19:22:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMG-000600-6z for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:48 +0000 Received: from [85.158.139.211:64707] by server-9.bemta-5.messagelabs.com id 27/A4-14363-78CD2C35; Sun, 13 Jul 2014 19:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1405279365!15286666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14502 invoked from network); 13 Jul 2014 19:22:46 -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; 13 Jul 2014 19:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMD-0003U2-Bh for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMD-0007zP-9P for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:45 +0000 Date: Sun, 13 Jul 2014 19:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: only put_page for p2m operations which require it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a931087092db0a58e3ef4b1a4da47a9796d86f61 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:42 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:53 2014 +0100 xen: arm: only put_page for p2m operations which require it. In particular do not do it for CACHEFLUSH. INSERT, RELINQUISH and REMOVE should all put the page (if the current pte is valid). ALLOCATE doesn't need to since it asserts the current PTE must be invalid. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 9960e17..ea05b6d 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -299,6 +299,23 @@ enum p2m_operation { CACHEFLUSH, }; +static void p2m_put_page(const lpae_t pte) +{ + /* TODO: Handle other p2m types + * + * It's safe to do the put_page here because page_alloc will + * flush the TLBs if the page is reallocated before the end of + * this loop. + */ + if ( p2m_is_foreign(pte.p2m.type) ) + { + unsigned long mfn = pte.p2m.base; + + ASSERT(mfn_valid(mfn)); + put_page(mfn_to_page(mfn)); + } +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -400,20 +417,6 @@ static int apply_p2m_changes(struct domain *d, flush |= pte.p2m.valid; - /* TODO: Handle other p2m type - * - * It's safe to do the put_page here because page_alloc will - * flush the TLBs if the page is reallocated before the end of - * this loop. - */ - if ( pte.p2m.valid && p2m_is_foreign(pte.p2m.type) ) - { - unsigned long mfn = pte.p2m.base; - - ASSERT(mfn_valid(mfn)); - put_page(mfn_to_page(mfn)); - } - switch (op) { case ALLOCATE: { @@ -436,6 +439,8 @@ static int apply_p2m_changes(struct domain *d, break; case INSERT: { + if ( pte.p2m.valid ) + p2m_put_page(pte); pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr, t); p2m_write_pte(&third[third_table_offset(addr)], pte, flush_pt); @@ -451,6 +456,8 @@ static int apply_p2m_changes(struct domain *d, break; } + p2m_put_page(pte); + count += 0x10; memset(&pte, 0x00, sizeof(pte)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PMR-00061z-Uw; Sun, 13 Jul 2014 19:22:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMQ-00061c-8F for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:58 +0000 Received: from [85.158.137.68:29947] by server-15.bemta-3.messagelabs.com id 77/48-26980-19CD2C35; Sun, 13 Jul 2014 19:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279375!15628976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18791 invoked from network); 13 Jul 2014 19:22: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; 13 Jul 2014 19:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMN-0003UE-Hz for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMN-00080P-F6 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:55 +0000 Date: Sun, 13 Jul 2014 19:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle superpage mappings in p2m_lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b814e01c6411973ed8394fb75d8b0706928e95c Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:43 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:53 2014 +0100 xen: arm: handle superpage mappings in p2m_lookup Currently none are actually created, but they will be shortly. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ea05b6d..8a6d295 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -123,6 +123,7 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) struct p2m_domain *p2m = &d->arch.p2m; lpae_t pte, *first = NULL, *second = NULL, *third = NULL; paddr_t maddr = INVALID_PADDR; + paddr_t mask; p2m_type_t _t; /* Allow t to be NULL */ @@ -136,15 +137,21 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) if ( !first ) goto err; + mask = FIRST_MASK; pte = first[first_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = SECOND_MASK; second = map_domain_page(pte.p2m.base); pte = second[second_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = THIRD_MASK; + + BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); + third = map_domain_page(pte.p2m.base); pte = third[third_table_offset(paddr)]; @@ -156,7 +163,7 @@ done: if ( pte.p2m.valid ) { ASSERT(pte.p2m.type != p2m_invalid); - maddr = (pte.bits & PADDR_MASK & PAGE_MASK) | (paddr & ~PAGE_MASK); + maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); *t = pte.p2m.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 Sun Jul 13 19:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:22: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 1X6PMR-00061z-Uw; Sun, 13 Jul 2014 19:22:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMQ-00061c-8F for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:58 +0000 Received: from [85.158.137.68:29947] by server-15.bemta-3.messagelabs.com id 77/48-26980-19CD2C35; Sun, 13 Jul 2014 19:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279375!15628976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18791 invoked from network); 13 Jul 2014 19:22: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; 13 Jul 2014 19:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMN-0003UE-Hz for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMN-00080P-F6 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:22:55 +0000 Date: Sun, 13 Jul 2014 19:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle superpage mappings in p2m_lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b814e01c6411973ed8394fb75d8b0706928e95c Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:43 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:53 2014 +0100 xen: arm: handle superpage mappings in p2m_lookup Currently none are actually created, but they will be shortly. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ea05b6d..8a6d295 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -123,6 +123,7 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) struct p2m_domain *p2m = &d->arch.p2m; lpae_t pte, *first = NULL, *second = NULL, *third = NULL; paddr_t maddr = INVALID_PADDR; + paddr_t mask; p2m_type_t _t; /* Allow t to be NULL */ @@ -136,15 +137,21 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) if ( !first ) goto err; + mask = FIRST_MASK; pte = first[first_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = SECOND_MASK; second = map_domain_page(pte.p2m.base); pte = second[second_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = THIRD_MASK; + + BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); + third = map_domain_page(pte.p2m.base); pte = third[third_table_offset(paddr)]; @@ -156,7 +163,7 @@ done: if ( pte.p2m.valid ) { ASSERT(pte.p2m.type != p2m_invalid); - maddr = (pte.bits & PADDR_MASK & PAGE_MASK) | (paddr & ~PAGE_MASK); + maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); *t = pte.p2m.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 Sun Jul 13 19:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMc-00063a-1L; Sun, 13 Jul 2014 19:23:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMa-00063M-Hv for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:08 +0000 Received: from [85.158.139.211:10869] by server-3.bemta-5.messagelabs.com id 47/59-01676-B9CD2C35; Sun, 13 Jul 2014 19:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279386!15321472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14554 invoked from network); 13 Jul 2014 19:23:06 -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; 13 Jul 2014 19:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMX-0003Un-QQ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMX-00080z-L9 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:05 +0000 Date: Sun, 13 Jul 2014 19:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add some helpers for assessing p2m pte X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 000a2383613d55315d01e51112d2a9e13b6b08ae Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:44 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:54 2014 +0100 xen: arm: add some helpers for assessing p2m pte Not terribly helpful right now, since they aren't widely used, but makes future patches easier to read. p2m_mapping is unused for the time-being and is therefore commented out (otherwise the compiler complains about an unused function). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8a6d295..cb22e9c 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -14,6 +14,24 @@ #define P2M_FIRST_ORDER 1 #define P2M_FIRST_ENTRIES (LPAE_ENTRIES<arch.p2m; @@ -139,13 +157,13 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) mask = FIRST_MASK; pte = first[first_table_offset(paddr)]; - if ( !pte.p2m.valid || !pte.p2m.table ) + if ( !p2m_table(pte) ) goto done; mask = SECOND_MASK; second = map_domain_page(pte.p2m.base); pte = second[second_table_offset(paddr)]; - if ( !pte.p2m.valid || !pte.p2m.table ) + if ( !p2m_table(pte) ) goto done; mask = THIRD_MASK; @@ -156,11 +174,11 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) pte = third[third_table_offset(paddr)]; /* This bit must be one in the level 3 entry */ - if ( !pte.p2m.table ) + if ( !p2m_table(pte) ) pte.bits = 0; done: - if ( pte.p2m.valid ) + if ( p2m_valid(pte) ) { ASSERT(pte.p2m.type != p2m_invalid); maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); @@ -367,7 +385,7 @@ static int apply_p2m_changes(struct domain *d, cur_first_page = p2m_first_level_index(addr); } - if ( !first[first_table_offset(addr)].p2m.valid ) + if ( !p2m_valid(first[first_table_offset(addr)]) ) { if ( !populate ) { @@ -384,7 +402,7 @@ static int apply_p2m_changes(struct domain *d, } } - BUG_ON(!first[first_table_offset(addr)].p2m.valid); + BUG_ON(!p2m_valid(first[first_table_offset(addr)])); if ( cur_first_offset != first_table_offset(addr) ) { @@ -394,7 +412,7 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ - if ( !second[second_table_offset(addr)].p2m.valid ) + if ( !p2m_valid(second[second_table_offset(addr)]) ) { if ( !populate ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMc-00063a-1L; Sun, 13 Jul 2014 19:23:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMa-00063M-Hv for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:08 +0000 Received: from [85.158.139.211:10869] by server-3.bemta-5.messagelabs.com id 47/59-01676-B9CD2C35; Sun, 13 Jul 2014 19:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279386!15321472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14554 invoked from network); 13 Jul 2014 19:23:06 -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; 13 Jul 2014 19:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMX-0003Un-QQ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMX-00080z-L9 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:05 +0000 Date: Sun, 13 Jul 2014 19:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add some helpers for assessing p2m pte X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 000a2383613d55315d01e51112d2a9e13b6b08ae Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:44 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 10:41:54 2014 +0100 xen: arm: add some helpers for assessing p2m pte Not terribly helpful right now, since they aren't widely used, but makes future patches easier to read. p2m_mapping is unused for the time-being and is therefore commented out (otherwise the compiler complains about an unused function). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8a6d295..cb22e9c 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -14,6 +14,24 @@ #define P2M_FIRST_ORDER 1 #define P2M_FIRST_ENTRIES (LPAE_ENTRIES<arch.p2m; @@ -139,13 +157,13 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) mask = FIRST_MASK; pte = first[first_table_offset(paddr)]; - if ( !pte.p2m.valid || !pte.p2m.table ) + if ( !p2m_table(pte) ) goto done; mask = SECOND_MASK; second = map_domain_page(pte.p2m.base); pte = second[second_table_offset(paddr)]; - if ( !pte.p2m.valid || !pte.p2m.table ) + if ( !p2m_table(pte) ) goto done; mask = THIRD_MASK; @@ -156,11 +174,11 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) pte = third[third_table_offset(paddr)]; /* This bit must be one in the level 3 entry */ - if ( !pte.p2m.table ) + if ( !p2m_table(pte) ) pte.bits = 0; done: - if ( pte.p2m.valid ) + if ( p2m_valid(pte) ) { ASSERT(pte.p2m.type != p2m_invalid); maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); @@ -367,7 +385,7 @@ static int apply_p2m_changes(struct domain *d, cur_first_page = p2m_first_level_index(addr); } - if ( !first[first_table_offset(addr)].p2m.valid ) + if ( !p2m_valid(first[first_table_offset(addr)]) ) { if ( !populate ) { @@ -384,7 +402,7 @@ static int apply_p2m_changes(struct domain *d, } } - BUG_ON(!first[first_table_offset(addr)].p2m.valid); + BUG_ON(!p2m_valid(first[first_table_offset(addr)])); if ( cur_first_offset != first_table_offset(addr) ) { @@ -394,7 +412,7 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ - if ( !second[second_table_offset(addr)].p2m.valid ) + if ( !p2m_valid(second[second_table_offset(addr)]) ) { if ( !populate ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMm-00065O-63; Sun, 13 Jul 2014 19:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMk-000656-SU for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:18 +0000 Received: from [193.109.254.147:17798] by server-13.bemta-14.messagelabs.com id FD/DF-14699-5ACD2C35; Sun, 13 Jul 2014 19:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1405279396!17196639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30463 invoked from network); 13 Jul 2014 19:23:17 -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; 13 Jul 2014 19:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMh-0003Ut-VU for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMh-00081R-UL for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:15 +0000 Date: Sun, 13 Jul 2014 19:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenctx: Correct use of xc_domain_{, un}pause() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6de560fadabb8a19887aa4320857088dba9a2b95 Author: Andrew Cooper AuthorDate: Fri Jul 4 17:06:20 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:07 2014 +0100 tools/xenctx: Correct use of xc_domain_{, un}pause() The previous code never worked correctly. There was a TOCTOU race between checking dominfo and pausing the domain. Since c/s 3eb1c708, Xen properly reference counts pause hypercalls, so unconditionally pause and unpause the domain. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: George Dunlap Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 82bd789..4ed120a 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -91,7 +91,6 @@ static struct xenctx { int do_stack; #endif int kernel_start_set; - int self_paused; xc_dominfo_t dominfo; } xenctx; @@ -1273,13 +1272,10 @@ int main(int argc, char **argv) exit(-1); } - if (!xenctx.dominfo.paused) { - ret = xc_domain_pause(xenctx.xc_handle, xenctx.domid); - if (ret < 0) { - perror("xc_domain_pause"); - exit(-1); - } - xenctx.self_paused = 1; + ret = xc_domain_pause(xenctx.xc_handle, xenctx.domid); + if (ret < 0) { + perror("xc_domain_pause"); + exit(-1); } #ifndef NO_TRANSLATION @@ -1303,12 +1299,10 @@ int main(int argc, char **argv) if ( do_default ) dump_ctx(vcpu); - if (xenctx.self_paused) { - ret = xc_domain_unpause(xenctx.xc_handle, xenctx.domid); - if (ret < 0) { - perror("xc_domain_unpause"); - exit(-1); - } + ret = xc_domain_unpause(xenctx.xc_handle, xenctx.domid); + if (ret < 0) { + perror("xc_domain_unpause"); + exit(-1); } ret = xc_interface_close(xenctx.xc_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMm-00065O-63; Sun, 13 Jul 2014 19:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMk-000656-SU for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:18 +0000 Received: from [193.109.254.147:17798] by server-13.bemta-14.messagelabs.com id FD/DF-14699-5ACD2C35; Sun, 13 Jul 2014 19:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1405279396!17196639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30463 invoked from network); 13 Jul 2014 19:23:17 -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; 13 Jul 2014 19:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMh-0003Ut-VU for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMh-00081R-UL for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:15 +0000 Date: Sun, 13 Jul 2014 19:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenctx: Correct use of xc_domain_{, un}pause() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6de560fadabb8a19887aa4320857088dba9a2b95 Author: Andrew Cooper AuthorDate: Fri Jul 4 17:06:20 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:07 2014 +0100 tools/xenctx: Correct use of xc_domain_{, un}pause() The previous code never worked correctly. There was a TOCTOU race between checking dominfo and pausing the domain. Since c/s 3eb1c708, Xen properly reference counts pause hypercalls, so unconditionally pause and unpause the domain. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: George Dunlap Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 82bd789..4ed120a 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -91,7 +91,6 @@ static struct xenctx { int do_stack; #endif int kernel_start_set; - int self_paused; xc_dominfo_t dominfo; } xenctx; @@ -1273,13 +1272,10 @@ int main(int argc, char **argv) exit(-1); } - if (!xenctx.dominfo.paused) { - ret = xc_domain_pause(xenctx.xc_handle, xenctx.domid); - if (ret < 0) { - perror("xc_domain_pause"); - exit(-1); - } - xenctx.self_paused = 1; + ret = xc_domain_pause(xenctx.xc_handle, xenctx.domid); + if (ret < 0) { + perror("xc_domain_pause"); + exit(-1); } #ifndef NO_TRANSLATION @@ -1303,12 +1299,10 @@ int main(int argc, char **argv) if ( do_default ) dump_ctx(vcpu); - if (xenctx.self_paused) { - ret = xc_domain_unpause(xenctx.xc_handle, xenctx.domid); - if (ret < 0) { - perror("xc_domain_unpause"); - exit(-1); - } + ret = xc_domain_unpause(xenctx.xc_handle, xenctx.domid); + if (ret < 0) { + perror("xc_domain_unpause"); + exit(-1); } ret = xc_interface_close(xenctx.xc_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMw-000672-8u; Sun, 13 Jul 2014 19:23:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMv-00066o-33 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:29 +0000 Received: from [85.158.143.35:51179] by server-1.bemta-4.messagelabs.com id 7C/C0-30046-0BCD2C35; Sun, 13 Jul 2014 19:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1405279406!17420420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13010 invoked from network); 13 Jul 2014 19:23:27 -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; 13 Jul 2014 19:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMs-0003Uz-5B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMs-00081p-3B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:26 +0000 Date: Sun, 13 Jul 2014 19:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't save/restore context for idle VCPU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02004df07a497ea5a45f17ac72b22f307d79a669 Author: Julien Grall AuthorDate: Mon Jul 7 16:29:15 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:08 2014 +0100 xen/arm: Don't save/restore context for idle VCPU When an idle VCPU is running, Xen will never exit the hypervisor mode. Futhermore, some part of the VCPU/domain initialization is already skipped for them to avoid memory consumption. Actually each save/restore functions are checking themself if the vcpu is an idle one or not. We can safely skipped the context switch in one place and gain a bit of time when we {,un}schedule idle VCPU. This is because the saving part will take care of disabling anything related to guest (such as GICv). Also replace every check of and idle VCPU in save/restore functions by an ASSERT, to know if someone is calling them with an idle VCPU in argument. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 14 ++++++++++++++ xen/arch/arm/gic.c | 5 ++--- xen/arch/arm/vtimer.c | 6 ++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index bb5c810..0c16f23 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -60,6 +60,12 @@ void idle_loop(void) static void ctxt_switch_from(struct vcpu *p) { + /* When the idle VCPU is running, Xen will always stay in hypervisor + * mode. Therefore we don't need to save the context of an idle VCPU. + */ + if ( is_idle_vcpu(p) ) + goto end_context; + p2m_save_state(p); /* CP 15 */ @@ -132,11 +138,19 @@ static void ctxt_switch_from(struct vcpu *p) gic_save_state(p); isb(); + +end_context: context_saved(p); } static void ctxt_switch_to(struct vcpu *n) { + /* When the idle VCPU is running, Xen will always stay in hypervisor + * mode. Therefore we don't need to restore the context of an idle VCPU. + */ + if ( is_idle_vcpu(n) ) + return; + p2m_restore_state(n); WRITE_SYSREG32(n->domain->arch.vpidr, VPIDR_EL2); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e1e27b35..83b004c 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -69,6 +69,7 @@ unsigned int gic_number_lines(void) void gic_save_state(struct vcpu *v) { ASSERT(!local_irq_is_enabled()); + ASSERT(!is_idle_vcpu(v)); /* No need for spinlocks here because interrupts are disabled around * this call and it only accesses struct vcpu fields that cannot be @@ -82,9 +83,7 @@ void gic_save_state(struct vcpu *v) void gic_restore_state(struct vcpu *v) { ASSERT(!local_irq_is_enabled()); - - if ( is_idle_vcpu(v) ) - return; + ASSERT(!is_idle_vcpu(v)); this_cpu(lr_mask) = v->arch.lr_mask; gic_hw_ops->restore_state(v); diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 690657b..2e95ceb 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -94,8 +94,7 @@ void vcpu_timer_destroy(struct vcpu *v) int virt_timer_save(struct vcpu *v) { - if ( is_idle_domain(v->domain) ) - return 0; + ASSERT(!is_idle_vcpu(v)); v->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(v->arch.virt_timer.ctl & ~CNTx_CTL_ENABLE, CNTV_CTL_EL0); @@ -111,8 +110,7 @@ int virt_timer_save(struct vcpu *v) int virt_timer_restore(struct vcpu *v) { - if ( is_idle_domain(v->domain) ) - return 0; + ASSERT(!is_idle_vcpu(v)); stop_timer(&v->arch.virt_timer.timer); migrate_timer(&v->arch.virt_timer.timer, v->processor); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PMw-000672-8u; Sun, 13 Jul 2014 19:23:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMv-00066o-33 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:29 +0000 Received: from [85.158.143.35:51179] by server-1.bemta-4.messagelabs.com id 7C/C0-30046-0BCD2C35; Sun, 13 Jul 2014 19:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1405279406!17420420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13010 invoked from network); 13 Jul 2014 19:23:27 -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; 13 Jul 2014 19:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PMs-0003Uz-5B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PMs-00081p-3B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:26 +0000 Date: Sun, 13 Jul 2014 19:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't save/restore context for idle VCPU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02004df07a497ea5a45f17ac72b22f307d79a669 Author: Julien Grall AuthorDate: Mon Jul 7 16:29:15 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:08 2014 +0100 xen/arm: Don't save/restore context for idle VCPU When an idle VCPU is running, Xen will never exit the hypervisor mode. Futhermore, some part of the VCPU/domain initialization is already skipped for them to avoid memory consumption. Actually each save/restore functions are checking themself if the vcpu is an idle one or not. We can safely skipped the context switch in one place and gain a bit of time when we {,un}schedule idle VCPU. This is because the saving part will take care of disabling anything related to guest (such as GICv). Also replace every check of and idle VCPU in save/restore functions by an ASSERT, to know if someone is calling them with an idle VCPU in argument. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 14 ++++++++++++++ xen/arch/arm/gic.c | 5 ++--- xen/arch/arm/vtimer.c | 6 ++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index bb5c810..0c16f23 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -60,6 +60,12 @@ void idle_loop(void) static void ctxt_switch_from(struct vcpu *p) { + /* When the idle VCPU is running, Xen will always stay in hypervisor + * mode. Therefore we don't need to save the context of an idle VCPU. + */ + if ( is_idle_vcpu(p) ) + goto end_context; + p2m_save_state(p); /* CP 15 */ @@ -132,11 +138,19 @@ static void ctxt_switch_from(struct vcpu *p) gic_save_state(p); isb(); + +end_context: context_saved(p); } static void ctxt_switch_to(struct vcpu *n) { + /* When the idle VCPU is running, Xen will always stay in hypervisor + * mode. Therefore we don't need to restore the context of an idle VCPU. + */ + if ( is_idle_vcpu(n) ) + return; + p2m_restore_state(n); WRITE_SYSREG32(n->domain->arch.vpidr, VPIDR_EL2); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e1e27b35..83b004c 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -69,6 +69,7 @@ unsigned int gic_number_lines(void) void gic_save_state(struct vcpu *v) { ASSERT(!local_irq_is_enabled()); + ASSERT(!is_idle_vcpu(v)); /* No need for spinlocks here because interrupts are disabled around * this call and it only accesses struct vcpu fields that cannot be @@ -82,9 +83,7 @@ void gic_save_state(struct vcpu *v) void gic_restore_state(struct vcpu *v) { ASSERT(!local_irq_is_enabled()); - - if ( is_idle_vcpu(v) ) - return; + ASSERT(!is_idle_vcpu(v)); this_cpu(lr_mask) = v->arch.lr_mask; gic_hw_ops->restore_state(v); diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 690657b..2e95ceb 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -94,8 +94,7 @@ void vcpu_timer_destroy(struct vcpu *v) int virt_timer_save(struct vcpu *v) { - if ( is_idle_domain(v->domain) ) - return 0; + ASSERT(!is_idle_vcpu(v)); v->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(v->arch.virt_timer.ctl & ~CNTx_CTL_ENABLE, CNTV_CTL_EL0); @@ -111,8 +110,7 @@ int virt_timer_save(struct vcpu *v) int virt_timer_restore(struct vcpu *v) { - if ( is_idle_domain(v->domain) ) - return 0; + ASSERT(!is_idle_vcpu(v)); stop_timer(&v->arch.virt_timer.timer); migrate_timer(&v->arch.virt_timer.timer, v->processor); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PN6-00068U-Bj; Sun, 13 Jul 2014 19:23:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PN5-00068H-5B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:39 +0000 Received: from [85.158.137.68:11437] by server-11.bemta-3.messagelabs.com id FF/B2-12889-ABCD2C35; Sun, 13 Jul 2014 19:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279416!15629017!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21832 invoked from network); 13 Jul 2014 19:23:37 -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; 13 Jul 2014 19:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PN2-0003V7-9y for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PN2-00082F-8L for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:36 +0000 Date: Sun, 13 Jul 2014 19:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Install arch-arm directory 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 f224b60791b539df66c1fe89d7866170653428b6 Author: Julien Grall AuthorDate: Tue Jul 8 18:04:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:08 2014 +0100 xen: Install arch-arm directory headers Some headers for ARM are not installed on the host. This may make external software relying on Xen headers failed to compile on ARM. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/include/Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index 9ed41f1..f7a6256 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -13,7 +13,7 @@ xen/.dir: mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen - ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign @@ -23,6 +23,8 @@ xen/.dir: install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io @@ -32,6 +34,11 @@ install: all $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + +# xen/arch-arm doesn't contains headers for now. Uncommented the line +# as soon as a new header is added +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PN6-00068U-Bj; Sun, 13 Jul 2014 19:23:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PN5-00068H-5B for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:39 +0000 Received: from [85.158.137.68:11437] by server-11.bemta-3.messagelabs.com id FF/B2-12889-ABCD2C35; Sun, 13 Jul 2014 19:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279416!15629017!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21832 invoked from network); 13 Jul 2014 19:23:37 -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; 13 Jul 2014 19:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PN2-0003V7-9y for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PN2-00082F-8L for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:36 +0000 Date: Sun, 13 Jul 2014 19:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Install arch-arm directory 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 f224b60791b539df66c1fe89d7866170653428b6 Author: Julien Grall AuthorDate: Tue Jul 8 18:04:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:20:08 2014 +0100 xen: Install arch-arm directory headers Some headers for ARM are not installed on the host. This may make external software relying on Xen headers failed to compile on ARM. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/include/Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index 9ed41f1..f7a6256 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -13,7 +13,7 @@ xen/.dir: mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen - ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign @@ -23,6 +23,8 @@ xen/.dir: install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io @@ -32,6 +34,11 @@ install: all $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + +# xen/arch-arm doesn't contains headers for now. Uncommented the line +# as soon as a new header is added +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PNG-0006A5-Ea; Sun, 13 Jul 2014 19:23:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNF-00069o-32 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:49 +0000 Received: from [85.158.139.211:52379] by server-11.bemta-5.messagelabs.com id 52/7B-01425-4CCD2C35; Sun, 13 Jul 2014 19:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1405279426!9894378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21519 invoked from network); 13 Jul 2014 19:23:47 -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; 13 Jul 2014 19:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNC-0003VD-JJ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNC-00082b-D1 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:46 +0000 Date: Sun, 13 Jul 2014 19:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/python: Improve .gitignore and clean Makefile 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 86229197cfefac9934854510fd2b85602e8037b3 Author: Andrew Cooper AuthorDate: Mon Jul 7 11:26:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:32 2014 +0100 tools/python: Improve .gitignore and clean Makefile rule Ignore all intermediate python files, and use find in the clean rule as there are no Makefiles in subdirectories to participate in a recursive clean. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- .gitignore | 1 + tools/python/Makefile | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 562c262..cf9264f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.spit *.gcno *.gcda +*.py[ocd] TAGS GTAGS GRTAGS diff --git a/tools/python/Makefile b/tools/python/Makefile index eee746d..c914332 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -29,10 +29,8 @@ test: .PHONY: clean clean: - rm -f $(XENPATH) - rm -rf build/ *.pyc *.pyo *.o *.a *~ xen/util/auxbin.pyc - rm -f xen/lowlevel/xl/_pyxl_types.h - rm -f xen/lowlevel/xl/_pyxl_types.c - rm -f $(DEPS) + find . \( -name "*.py[ocd]" -o -name "*~" -o -name "_*.[hc]" \) -delete + rm -rf build/ + rm -f $(XENPATH) $(DEPS) -include $(DEPS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:23: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 1X6PNG-0006A5-Ea; Sun, 13 Jul 2014 19:23:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNF-00069o-32 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:49 +0000 Received: from [85.158.139.211:52379] by server-11.bemta-5.messagelabs.com id 52/7B-01425-4CCD2C35; Sun, 13 Jul 2014 19:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1405279426!9894378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21519 invoked from network); 13 Jul 2014 19:23:47 -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; 13 Jul 2014 19:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNC-0003VD-JJ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNC-00082b-D1 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:46 +0000 Date: Sun, 13 Jul 2014 19:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/python: Improve .gitignore and clean Makefile 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 86229197cfefac9934854510fd2b85602e8037b3 Author: Andrew Cooper AuthorDate: Mon Jul 7 11:26:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:32 2014 +0100 tools/python: Improve .gitignore and clean Makefile rule Ignore all intermediate python files, and use find in the clean rule as there are no Makefiles in subdirectories to participate in a recursive clean. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- .gitignore | 1 + tools/python/Makefile | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 562c262..cf9264f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.spit *.gcno *.gcda +*.py[ocd] TAGS GTAGS GRTAGS diff --git a/tools/python/Makefile b/tools/python/Makefile index eee746d..c914332 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -29,10 +29,8 @@ test: .PHONY: clean clean: - rm -f $(XENPATH) - rm -rf build/ *.pyc *.pyo *.o *.a *~ xen/util/auxbin.pyc - rm -f xen/lowlevel/xl/_pyxl_types.h - rm -f xen/lowlevel/xl/_pyxl_types.c - rm -f $(DEPS) + find . \( -name "*.py[ocd]" -o -name "*~" -o -name "_*.[hc]" \) -delete + rm -rf build/ + rm -f $(XENPATH) $(DEPS) -include $(DEPS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNQ-0006BY-HF; Sun, 13 Jul 2014 19:24:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNP-0006BJ-Cs for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:59 +0000 Received: from [85.158.143.35:23241] by server-3.bemta-4.messagelabs.com id 9A/73-09960-ECCD2C35; Sun, 13 Jul 2014 19:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1405279436!17420308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11558 invoked from network); 13 Jul 2014 19:23: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; 13 Jul 2014 19:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNM-0003VM-OV for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNM-00083h-N2 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:56 +0000 Date: Sun, 13 Jul 2014 19:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Some clean up in time.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 6c76cb8cb595d4f430976f919b6b0e161d4f4573 Author: Julien Grall AuthorDate: Wed Jul 9 14:34:54 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:40 2014 +0100 xen/arm: Some clean up in time.c The file xen/arm/time.c contains some unused code: - calibrate_timer: firmware already set correctly CNTFRQ. If it's not the case the device tree will containt a property clock-frequency in the timer node - USE_HYP_TIMER: It's set unconditionally to 1. I didn't see any recent model having issue with the hyp timer. I think we can drop it safely. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/time.c | 52 --------------------------------------------------- 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 4c3e1a6..a6436f1 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -36,13 +36,6 @@ #include #include -/* - * Unfortunately the hypervisor timer interrupt appears to be buggy in - * some versions of the model. Disable this to use the physical timer - * instead. - */ -#define USE_HYP_TIMER 1 - uint64_t __read_mostly boot_count; /* For fine-grained timekeeping, we use the ARM "Generic Timer", a @@ -68,37 +61,6 @@ unsigned int timer_get_irq(enum timer_ppi ppi) return muldiv64(ns, 1000 * cpu_khz, SECONDS(1)); } -/* TODO: On a real system the firmware would have set the frequency in - the CNTFRQ register. Also we'd need to use devicetree to find - the RTC. When we've seen some real systems, we can delete this. -static uint32_t calibrate_timer(void) -{ - uint32_t sec; - uint64_t start, end; - paddr_t rtc_base = 0x1C170000ull; - volatile uint32_t *rtc; - - ASSERT(!local_irq_is_enabled()); - set_fixmap(FIXMAP_MISC, rtc_base >> PAGE_SHIFT, DEV_SHARED); - rtc = (uint32_t *) FIXMAP_ADDR(FIXMAP_MISC); - - printk("Calibrating timer against RTC..."); - // Turn on the RTC - rtc[3] = 1; - // Wait for an edge - sec = rtc[0] + 1; - do {} while ( rtc[0] != sec ); - // Now time a few seconds - start = READ_SYSREG64(CNTPCT_EL0); - do {} while ( rtc[0] < sec + 32 ); - end = READ_SYSREG64(CNTPCT_EL0); - printk("done.\n"); - - clear_fixmap(FIXMAP_MISC); - return (end - start) / 32; -} -*/ - /* Set up the timer on the boot CPU */ int __init init_xen_time(void) { @@ -169,22 +131,13 @@ int reprogram_timer(s_time_t timeout) if ( timeout == 0 ) { -#if USE_HYP_TIMER WRITE_SYSREG32(0, CNTHP_CTL_EL2); -#else - WRITE_SYSREG32(0, CNTP_CTL_EL0); -#endif return 1; } deadline = ns_to_ticks(timeout) + boot_count; -#if USE_HYP_TIMER WRITE_SYSREG64(deadline, CNTHP_CVAL_EL2); WRITE_SYSREG32(CNTx_CTL_ENABLE, CNTHP_CTL_EL2); -#else - WRITE_SYSREG64(deadline, CNTP_CVAL_EL0); - WRITE_SYSREG32(CNTx_CTL_ENABLE, CNTP_CTL_EL0); -#endif isb(); /* No need to check for timers in the past; the Generic Timer fires @@ -226,13 +179,8 @@ void __cpuinit init_timer_interrupt(void) { /* Sensible defaults */ WRITE_SYSREG64(0, CNTVOFF_EL2); /* No VM-specific offset */ -#if USE_HYP_TIMER /* Do not let the VMs program the physical timer, only read the physical counter */ WRITE_SYSREG32(CNTHCTL_PA, CNTHCTL_EL2); -#else - /* Cannot let VMs access physical counter if we are using it */ - WRITE_SYSREG32(0, CNTHCTL_EL2); -#endif WRITE_SYSREG32(0, CNTP_CTL_EL0); /* Physical timer disabled */ WRITE_SYSREG32(0, CNTHP_CTL_EL2); /* Hypervisor's timer disabled */ 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 Sun Jul 13 19:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNQ-0006BY-HF; Sun, 13 Jul 2014 19:24:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNP-0006BJ-Cs for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:59 +0000 Received: from [85.158.143.35:23241] by server-3.bemta-4.messagelabs.com id 9A/73-09960-ECCD2C35; Sun, 13 Jul 2014 19:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1405279436!17420308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11558 invoked from network); 13 Jul 2014 19:23: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; 13 Jul 2014 19:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNM-0003VM-OV for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNM-00083h-N2 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:23:56 +0000 Date: Sun, 13 Jul 2014 19:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Some clean up in time.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 6c76cb8cb595d4f430976f919b6b0e161d4f4573 Author: Julien Grall AuthorDate: Wed Jul 9 14:34:54 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:40 2014 +0100 xen/arm: Some clean up in time.c The file xen/arm/time.c contains some unused code: - calibrate_timer: firmware already set correctly CNTFRQ. If it's not the case the device tree will containt a property clock-frequency in the timer node - USE_HYP_TIMER: It's set unconditionally to 1. I didn't see any recent model having issue with the hyp timer. I think we can drop it safely. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/time.c | 52 --------------------------------------------------- 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 4c3e1a6..a6436f1 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -36,13 +36,6 @@ #include #include -/* - * Unfortunately the hypervisor timer interrupt appears to be buggy in - * some versions of the model. Disable this to use the physical timer - * instead. - */ -#define USE_HYP_TIMER 1 - uint64_t __read_mostly boot_count; /* For fine-grained timekeeping, we use the ARM "Generic Timer", a @@ -68,37 +61,6 @@ unsigned int timer_get_irq(enum timer_ppi ppi) return muldiv64(ns, 1000 * cpu_khz, SECONDS(1)); } -/* TODO: On a real system the firmware would have set the frequency in - the CNTFRQ register. Also we'd need to use devicetree to find - the RTC. When we've seen some real systems, we can delete this. -static uint32_t calibrate_timer(void) -{ - uint32_t sec; - uint64_t start, end; - paddr_t rtc_base = 0x1C170000ull; - volatile uint32_t *rtc; - - ASSERT(!local_irq_is_enabled()); - set_fixmap(FIXMAP_MISC, rtc_base >> PAGE_SHIFT, DEV_SHARED); - rtc = (uint32_t *) FIXMAP_ADDR(FIXMAP_MISC); - - printk("Calibrating timer against RTC..."); - // Turn on the RTC - rtc[3] = 1; - // Wait for an edge - sec = rtc[0] + 1; - do {} while ( rtc[0] != sec ); - // Now time a few seconds - start = READ_SYSREG64(CNTPCT_EL0); - do {} while ( rtc[0] < sec + 32 ); - end = READ_SYSREG64(CNTPCT_EL0); - printk("done.\n"); - - clear_fixmap(FIXMAP_MISC); - return (end - start) / 32; -} -*/ - /* Set up the timer on the boot CPU */ int __init init_xen_time(void) { @@ -169,22 +131,13 @@ int reprogram_timer(s_time_t timeout) if ( timeout == 0 ) { -#if USE_HYP_TIMER WRITE_SYSREG32(0, CNTHP_CTL_EL2); -#else - WRITE_SYSREG32(0, CNTP_CTL_EL0); -#endif return 1; } deadline = ns_to_ticks(timeout) + boot_count; -#if USE_HYP_TIMER WRITE_SYSREG64(deadline, CNTHP_CVAL_EL2); WRITE_SYSREG32(CNTx_CTL_ENABLE, CNTHP_CTL_EL2); -#else - WRITE_SYSREG64(deadline, CNTP_CVAL_EL0); - WRITE_SYSREG32(CNTx_CTL_ENABLE, CNTP_CTL_EL0); -#endif isb(); /* No need to check for timers in the past; the Generic Timer fires @@ -226,13 +179,8 @@ void __cpuinit init_timer_interrupt(void) { /* Sensible defaults */ WRITE_SYSREG64(0, CNTVOFF_EL2); /* No VM-specific offset */ -#if USE_HYP_TIMER /* Do not let the VMs program the physical timer, only read the physical counter */ WRITE_SYSREG32(CNTHCTL_PA, CNTHCTL_EL2); -#else - /* Cannot let VMs access physical counter if we are using it */ - WRITE_SYSREG32(0, CNTHCTL_EL2); -#endif WRITE_SYSREG32(0, CNTP_CTL_EL0); /* Physical timer disabled */ WRITE_SYSREG32(0, CNTHP_CTL_EL2); /* Hypervisor's timer disabled */ 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 Sun Jul 13 19:24:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNa-0006D4-K2; Sun, 13 Jul 2014 19:24:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNZ-0006Cq-Ji for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:09 +0000 Received: from [85.158.143.35:55829] by server-1.bemta-4.messagelabs.com id 3C/E0-30046-8DCD2C35; Sun, 13 Jul 2014 19:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1405279447!17468047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25650 invoked from network); 13 Jul 2014 19:24: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; 13 Jul 2014 19:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNW-0003Vv-Te for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNW-00084D-SA for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:06 +0000 Date: Sun, 13 Jul 2014 19:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: introduce PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a95c68d0aefc6a1958d9fd548c7005d0fd98a2f5 Author: Stefano Stabellini AuthorDate: Fri Jul 4 15:39:44 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:41 2014 +0100 xen/arm: introduce PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI GICH_LR_HW doesn't work as expected on X-Gene: request maintenance interrupts and perform EOIs in the hypervisor for hardware interrupts as a workaround. Trigger this behaviour with a per platform option. This patch assumes that GICC_DIR can be written on any pcpu for a given SPI, not matter where GICC_IAR has been read before. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell CC: psawargaonkar@apm.com CC: apatel@apm.com --- xen/arch/arm/gic-v2.c | 9 +++++++-- xen/arch/arm/gic.c | 4 ++++ xen/arch/arm/platforms/xgene-storm.c | 2 +- xen/include/asm-arm/platform.h | 5 +++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 009307a..843f5a1 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -396,8 +396,13 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); + { + if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) + lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; + else + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); + } writel_gich(lr_reg, GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 83b004c..256d9cf 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -366,7 +366,11 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) + { p->desc->status &= ~IRQ_INPROGRESS; + if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) + gic_hw_ops->deactivate_irq(p->desc); + } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index c9dd63c..837d8e6 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -37,7 +37,7 @@ static bool reset_vals_valid = false; static uint32_t xgene_storm_quirks(void) { - return PLATFORM_QUIRK_GIC_64K_STRIDE; + return PLATFORM_QUIRK_GIC_64K_STRIDE|PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI; } static int map_one_mmio(struct domain *d, const char *what, diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index bcd2097..eefaca6 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -55,6 +55,11 @@ struct platform_desc { */ #define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0) +/* + * Quirk for platforms where GICH_LR_HW does not work as expected. + */ +#define PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI (1 << 1) + void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(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 Sun Jul 13 19:24:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNa-0006D4-K2; Sun, 13 Jul 2014 19:24:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNZ-0006Cq-Ji for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:09 +0000 Received: from [85.158.143.35:55829] by server-1.bemta-4.messagelabs.com id 3C/E0-30046-8DCD2C35; Sun, 13 Jul 2014 19:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1405279447!17468047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25650 invoked from network); 13 Jul 2014 19:24: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; 13 Jul 2014 19:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNW-0003Vv-Te for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNW-00084D-SA for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:06 +0000 Date: Sun, 13 Jul 2014 19:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: introduce PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a95c68d0aefc6a1958d9fd548c7005d0fd98a2f5 Author: Stefano Stabellini AuthorDate: Fri Jul 4 15:39:44 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 11:30:41 2014 +0100 xen/arm: introduce PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI GICH_LR_HW doesn't work as expected on X-Gene: request maintenance interrupts and perform EOIs in the hypervisor for hardware interrupts as a workaround. Trigger this behaviour with a per platform option. This patch assumes that GICC_DIR can be written on any pcpu for a given SPI, not matter where GICC_IAR has been read before. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell CC: psawargaonkar@apm.com CC: apatel@apm.com --- xen/arch/arm/gic-v2.c | 9 +++++++-- xen/arch/arm/gic.c | 4 ++++ xen/arch/arm/platforms/xgene-storm.c | 2 +- xen/include/asm-arm/platform.h | 5 +++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 009307a..843f5a1 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -396,8 +396,13 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); + { + if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) + lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; + else + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); + } writel_gich(lr_reg, GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 83b004c..256d9cf 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -366,7 +366,11 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) + { p->desc->status &= ~IRQ_INPROGRESS; + if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) + gic_hw_ops->deactivate_irq(p->desc); + } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index c9dd63c..837d8e6 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -37,7 +37,7 @@ static bool reset_vals_valid = false; static uint32_t xgene_storm_quirks(void) { - return PLATFORM_QUIRK_GIC_64K_STRIDE; + return PLATFORM_QUIRK_GIC_64K_STRIDE|PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI; } static int map_one_mmio(struct domain *d, const char *what, diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index bcd2097..eefaca6 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -55,6 +55,11 @@ struct platform_desc { */ #define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0) +/* + * Quirk for platforms where GICH_LR_HW does not work as expected. + */ +#define PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI (1 << 1) + void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(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 Sun Jul 13 19:24:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNk-0006Eu-PG; Sun, 13 Jul 2014 19:24:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNj-0006Eh-J5 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:19 +0000 Received: from [193.109.254.147:10181] by server-6.bemta-14.messagelabs.com id E8/FD-08262-2ECD2C35; Sun, 13 Jul 2014 19:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1405279457!17184163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22938 invoked from network); 13 Jul 2014 19:24:18 -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; 13 Jul 2014 19:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNh-0003WA-3E for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNh-00084b-2A for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:17 +0000 Date: Sun, 13 Jul 2014 19:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: functions to check default values for builtin 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 47925f378394cd1351b4f1992bd75bed7e3ace93 Author: Wei Liu AuthorDate: Wed Jun 11 17:35:07 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:34 2014 +0100 libxl_internal: functions to check default values for builtin types They will be used in later patch to determine whether we should generate JSON output for a type. If that type has default value we just skip generating JSON output. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 3 +-- tools/libxl/libxl_cpuid.c | 5 +++++ tools/libxl/libxl_internal.c | 6 ++++++ tools/libxl/libxl_internal.h | 24 ++++++++++++++++++++++++ tools/libxl/libxl_nocpuid.c | 5 +++++ 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 39f1c28..c272b8d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2860,8 +2860,7 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, nic->model = strdup("rtl8139"); if (!nic->model) return ERROR_NOMEM; } - if (!nic->mac[0] && !nic->mac[1] && !nic->mac[2] && - !nic->mac[3] && !nic->mac[4] && !nic->mac[5]) { + if (libxl__mac_is_default(&nic->mac)) { const uint8_t *r; libxl_uuid uuid; diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 1f2bcd5..1706357 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -14,6 +14,11 @@ #include "libxl_internal.h" +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) +{ + return !libxl_cpuid_policy_list_length(pl); +} + void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) { int i, j; diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 6c94d3e..81f8985 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -307,6 +307,12 @@ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b) return 0; } +_hidden int libxl__mac_is_default(libxl_mac *mac) +{ + return (!(*mac)[0] && !(*mac)[1] && !(*mac)[2] && + !(*mac)[3] && !(*mac)[4] && !(*mac)[5]); +} + _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) { pthread_mutexattr_t attr; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e8f2abb..7750dc5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1549,6 +1549,8 @@ struct libxl__xen_console_reader { _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +/* return true if mac address is all zero (the default value) */ +_hidden int libxl__mac_is_default(libxl_mac *mac); /* init a recursive mutex */ _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock); @@ -3097,6 +3099,10 @@ _hidden int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, #define LIBXL__DEFBOOL_STR_DEFAULT "" #define LIBXL__DEFBOOL_STR_FALSE "False" #define LIBXL__DEFBOOL_STR_TRUE "True" +static inline int libxl__defbool_is_default(libxl_defbool *db) +{ + return !db->val; +} /* * Inserts "elm_new" into the sorted list "head". @@ -3193,6 +3199,24 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); #define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) #endif +/* This always return false, there's no "default value" for hw cap */ +static inline int libxl__hwcap_is_default(libxl_hwcap *hwcap) +{ + return 0; +} + +static inline int libxl__string_list_is_empty(libxl_string_list *psl) +{ + return !libxl_string_list_length(psl); +} + +static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) +{ + return !libxl_key_value_list_length(pkvl); +} + +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); + #endif /* diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index eb525fc..96e6e2e 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -14,6 +14,11 @@ #include "libxl_internal.h" +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) +{ + return 1; +} + void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) { } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PNk-0006Eu-PG; Sun, 13 Jul 2014 19:24:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNj-0006Eh-J5 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:19 +0000 Received: from [193.109.254.147:10181] by server-6.bemta-14.messagelabs.com id E8/FD-08262-2ECD2C35; Sun, 13 Jul 2014 19:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1405279457!17184163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22938 invoked from network); 13 Jul 2014 19:24:18 -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; 13 Jul 2014 19:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNh-0003WA-3E for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNh-00084b-2A for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:17 +0000 Date: Sun, 13 Jul 2014 19:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: functions to check default values for builtin 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 47925f378394cd1351b4f1992bd75bed7e3ace93 Author: Wei Liu AuthorDate: Wed Jun 11 17:35:07 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:34 2014 +0100 libxl_internal: functions to check default values for builtin types They will be used in later patch to determine whether we should generate JSON output for a type. If that type has default value we just skip generating JSON output. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 3 +-- tools/libxl/libxl_cpuid.c | 5 +++++ tools/libxl/libxl_internal.c | 6 ++++++ tools/libxl/libxl_internal.h | 24 ++++++++++++++++++++++++ tools/libxl/libxl_nocpuid.c | 5 +++++ 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 39f1c28..c272b8d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2860,8 +2860,7 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, nic->model = strdup("rtl8139"); if (!nic->model) return ERROR_NOMEM; } - if (!nic->mac[0] && !nic->mac[1] && !nic->mac[2] && - !nic->mac[3] && !nic->mac[4] && !nic->mac[5]) { + if (libxl__mac_is_default(&nic->mac)) { const uint8_t *r; libxl_uuid uuid; diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 1f2bcd5..1706357 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -14,6 +14,11 @@ #include "libxl_internal.h" +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) +{ + return !libxl_cpuid_policy_list_length(pl); +} + void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) { int i, j; diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 6c94d3e..81f8985 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -307,6 +307,12 @@ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b) return 0; } +_hidden int libxl__mac_is_default(libxl_mac *mac) +{ + return (!(*mac)[0] && !(*mac)[1] && !(*mac)[2] && + !(*mac)[3] && !(*mac)[4] && !(*mac)[5]); +} + _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) { pthread_mutexattr_t attr; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e8f2abb..7750dc5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1549,6 +1549,8 @@ struct libxl__xen_console_reader { _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +/* return true if mac address is all zero (the default value) */ +_hidden int libxl__mac_is_default(libxl_mac *mac); /* init a recursive mutex */ _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock); @@ -3097,6 +3099,10 @@ _hidden int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, #define LIBXL__DEFBOOL_STR_DEFAULT "" #define LIBXL__DEFBOOL_STR_FALSE "False" #define LIBXL__DEFBOOL_STR_TRUE "True" +static inline int libxl__defbool_is_default(libxl_defbool *db) +{ + return !db->val; +} /* * Inserts "elm_new" into the sorted list "head". @@ -3193,6 +3199,24 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); #define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) #endif +/* This always return false, there's no "default value" for hw cap */ +static inline int libxl__hwcap_is_default(libxl_hwcap *hwcap) +{ + return 0; +} + +static inline int libxl__string_list_is_empty(libxl_string_list *psl) +{ + return !libxl_string_list_length(psl); +} + +static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) +{ + return !libxl_key_value_list_length(pkvl); +} + +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); + #endif /* diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index eb525fc..96e6e2e 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -14,6 +14,11 @@ #include "libxl_internal.h" +int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) +{ + return 1; +} + void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) { } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNx-0006Gf-SX; Sun, 13 Jul 2014 19:24:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNx-0006GV-22 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:33 +0000 Received: from [85.158.143.35:24059] by server-3.bemta-4.messagelabs.com id 29/93-09960-0FCD2C35; Sun, 13 Jul 2014 19:24:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279467!10138673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13283 invoked from network); 13 Jul 2014 19:24:28 -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; 13 Jul 2014 19:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNr-0003WG-8f for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNr-00084y-6s for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:27 +0000 Date: Sun, 13 Jul 2014 19:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentypes.py: don't generate default values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 731233d64f6a7602c1ca297f7b67ec25433642e7 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentypes.py: don't generate default values If a field: 0. is not of aggregate type and 1. is of array type and the array is not empty or 2. is of a type which has init_val and has been set to init_val, or 3. is of builtin type and has been set to internal default value, or 4. is of a type which has no init_val and has been set to 0 then there's no need to generate output for that field in JSON output. Note that 0 can result in output like { ... FOO : { } ... } where FOO is aggregate type but all its fields are set to default, hence no JSON output in {} at all. This is not pretty, but it's still valid JSON. And the parser should be able to skip touching those fields in the resulting C structures. When the parser consumes that generated JSON object, all default values should be automatically filled in. Also change some non-zero init_vals to LIBXL_* for better readability in generated C code. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 33 +++++++++++++++++++++++++++++++-- tools/libxl/idl.py | 2 ++ tools/libxl/idl.txt | 9 +++++++++ tools/libxl/libxl_types.idl | 31 ++++++++++++++++++------------- 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 01416e7..f06afd9 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -206,6 +206,29 @@ def libxl_C_type_gen_map_key(f, parent, indent = ""): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def get_init_val(f): + if f.init_val is not None: + return f.init_val + elif f.type.init_val is not None: + return f.type.init_val + return None + +def get_default_expr(f, nparent, fexpr): + if isinstance(f.type, idl.Aggregate): + return "1 /* always generate JSON output for aggregate type */" + + if isinstance(f.type, idl.Array): + return "%s && %s" % (fexpr, nparent + f.type.lenvar.name) + + init_val = get_init_val(f) + if init_val is not None: + return "%s != %s" % (fexpr, init_val) + + if f.type.check_default_fn: + return "!%s(&%s)" % (f.type.check_default_fn, fexpr) + + return "%s" % fexpr + def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s = "" if parent is None: @@ -255,8 +278,14 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s += " goto out;\n" for f in [f for f in ty.fields if not f.const and not f.type.private]: (nparent,fexpr) = ty.member(v, f, parent is None) - s += libxl_C_type_gen_map_key(f, nparent) - s += libxl_C_type_gen_json(f.type, fexpr, "", nparent) + default_expr = get_default_expr(f, nparent, fexpr) + s += "if (%s) {\n" % default_expr + + s += libxl_C_type_gen_map_key(f, nparent, " ") + s += libxl_C_type_gen_json(f.type, fexpr, " ", nparent) + + s += "}\n" + s += "s = yajl_gen_map_close(hand);\n" s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 8b118dd..ada801a 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -64,6 +64,8 @@ class Type(object): self.init_val = kwargs.setdefault('init_val', None) self.autogenerate_init_fn = kwargs.setdefault('autogenerate_init_fn', False) + self.check_default_fn = kwargs.setdefault('check_default_fn', None) + if self.typename is not None and not self.private: self.json_gen_fn = kwargs.setdefault('json_gen_fn', self.typename + "_gen_json") else: diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 6a53dd8..d47eba8 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -69,6 +69,15 @@ Type.autogenerate_json: (default: True) Indicates if the above named Type.json_gen_fn should be autogenerated. +Type.check_default_fn: + + If it's set then calling this function shall return true if this type + has been set to default value (internal libxl implementation). + + If this is not set, that means we can check the type against init_val + (if it has one) or zero to determine whether the value is default + value. + Other simple type-Classes ------------------------- diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de25f42..439095a 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,19 +5,24 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE) +libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE, check_default_fn="libxl__defbool_is_default") libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False) libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) -libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) -libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE) -libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE) - -libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) -libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE) -libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) -libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE) +libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") +libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") +libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl_bitmap_is_empty") +libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__cpuid_policy_is_empty") + +libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__string_list_is_empty") +libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__key_value_list_is_empty") +libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__hwcap_is_default") +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") # # Specific integer types @@ -50,7 +55,7 @@ libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), (2, "PV"), - ], init_val = -1) + ], init_val = "LIBXL_DOMAIN_TYPE_INVALID") libxl_device_model_version = Enumeration("device_model_version", [ (0, "UNKNOWN"), @@ -96,7 +101,7 @@ libxl_action_on_shutdown = Enumeration("action_on_shutdown", [ (5, "COREDUMP_DESTROY"), (6, "COREDUMP_RESTART"), - ], init_val = 1) + ], init_val = "LIBXL_ACTION_ON_SHUTDOWN_DESTROY") libxl_trigger = Enumeration("trigger", [ (0, "UNKNOWN"), @@ -155,7 +160,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), (3, "NONE"), - ], init_val = 1) + ], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS") libxl_vendor_device = Enumeration("vendor_device", [ (0, "NONE"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNx-0006Gf-SX; Sun, 13 Jul 2014 19:24:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNx-0006GV-22 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:33 +0000 Received: from [85.158.143.35:24059] by server-3.bemta-4.messagelabs.com id 29/93-09960-0FCD2C35; Sun, 13 Jul 2014 19:24:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279467!10138673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13283 invoked from network); 13 Jul 2014 19:24:28 -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; 13 Jul 2014 19:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PNr-0003WG-8f for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PNr-00084y-6s for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:27 +0000 Date: Sun, 13 Jul 2014 19:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentypes.py: don't generate default values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 731233d64f6a7602c1ca297f7b67ec25433642e7 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentypes.py: don't generate default values If a field: 0. is not of aggregate type and 1. is of array type and the array is not empty or 2. is of a type which has init_val and has been set to init_val, or 3. is of builtin type and has been set to internal default value, or 4. is of a type which has no init_val and has been set to 0 then there's no need to generate output for that field in JSON output. Note that 0 can result in output like { ... FOO : { } ... } where FOO is aggregate type but all its fields are set to default, hence no JSON output in {} at all. This is not pretty, but it's still valid JSON. And the parser should be able to skip touching those fields in the resulting C structures. When the parser consumes that generated JSON object, all default values should be automatically filled in. Also change some non-zero init_vals to LIBXL_* for better readability in generated C code. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 33 +++++++++++++++++++++++++++++++-- tools/libxl/idl.py | 2 ++ tools/libxl/idl.txt | 9 +++++++++ tools/libxl/libxl_types.idl | 31 ++++++++++++++++++------------- 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 01416e7..f06afd9 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -206,6 +206,29 @@ def libxl_C_type_gen_map_key(f, parent, indent = ""): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def get_init_val(f): + if f.init_val is not None: + return f.init_val + elif f.type.init_val is not None: + return f.type.init_val + return None + +def get_default_expr(f, nparent, fexpr): + if isinstance(f.type, idl.Aggregate): + return "1 /* always generate JSON output for aggregate type */" + + if isinstance(f.type, idl.Array): + return "%s && %s" % (fexpr, nparent + f.type.lenvar.name) + + init_val = get_init_val(f) + if init_val is not None: + return "%s != %s" % (fexpr, init_val) + + if f.type.check_default_fn: + return "!%s(&%s)" % (f.type.check_default_fn, fexpr) + + return "%s" % fexpr + def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s = "" if parent is None: @@ -255,8 +278,14 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s += " goto out;\n" for f in [f for f in ty.fields if not f.const and not f.type.private]: (nparent,fexpr) = ty.member(v, f, parent is None) - s += libxl_C_type_gen_map_key(f, nparent) - s += libxl_C_type_gen_json(f.type, fexpr, "", nparent) + default_expr = get_default_expr(f, nparent, fexpr) + s += "if (%s) {\n" % default_expr + + s += libxl_C_type_gen_map_key(f, nparent, " ") + s += libxl_C_type_gen_json(f.type, fexpr, " ", nparent) + + s += "}\n" + s += "s = yajl_gen_map_close(hand);\n" s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 8b118dd..ada801a 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -64,6 +64,8 @@ class Type(object): self.init_val = kwargs.setdefault('init_val', None) self.autogenerate_init_fn = kwargs.setdefault('autogenerate_init_fn', False) + self.check_default_fn = kwargs.setdefault('check_default_fn', None) + if self.typename is not None and not self.private: self.json_gen_fn = kwargs.setdefault('json_gen_fn', self.typename + "_gen_json") else: diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 6a53dd8..d47eba8 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -69,6 +69,15 @@ Type.autogenerate_json: (default: True) Indicates if the above named Type.json_gen_fn should be autogenerated. +Type.check_default_fn: + + If it's set then calling this function shall return true if this type + has been set to default value (internal libxl implementation). + + If this is not set, that means we can check the type against init_val + (if it has one) or zero to determine whether the value is default + value. + Other simple type-Classes ------------------------- diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de25f42..439095a 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,19 +5,24 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE) +libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE, check_default_fn="libxl__defbool_is_default") libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False) libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) -libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) -libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE) -libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE) - -libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) -libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE) -libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) -libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE) +libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") +libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") +libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl_bitmap_is_empty") +libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__cpuid_policy_is_empty") + +libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__string_list_is_empty") +libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__key_value_list_is_empty") +libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__hwcap_is_default") +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") # # Specific integer types @@ -50,7 +55,7 @@ libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), (2, "PV"), - ], init_val = -1) + ], init_val = "LIBXL_DOMAIN_TYPE_INVALID") libxl_device_model_version = Enumeration("device_model_version", [ (0, "UNKNOWN"), @@ -96,7 +101,7 @@ libxl_action_on_shutdown = Enumeration("action_on_shutdown", [ (5, "COREDUMP_DESTROY"), (6, "COREDUMP_RESTART"), - ], init_val = 1) + ], init_val = "LIBXL_ACTION_ON_SHUTDOWN_DESTROY") libxl_trigger = Enumeration("trigger", [ (0, "UNKNOWN"), @@ -155,7 +160,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), (3, "NONE"), - ], init_val = 1) + ], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS") libxl_vendor_device = Enumeration("vendor_device", [ (0, "NONE"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PO4-0006Hh-VK; Sun, 13 Jul 2014 19:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PO4-0006HW-5l for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:40 +0000 Received: from [193.109.254.147:25786] by server-8.bemta-14.messagelabs.com id E6/87-14857-7FCD2C35; Sun, 13 Jul 2014 19:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405279477!17205966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20754 invoked from network); 13 Jul 2014 19:24:38 -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; 13 Jul 2014 19:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PO1-0003WO-FE for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PO1-00085S-Ci for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:37 +0000 Date: Sun, 13 Jul 2014 19:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clean up namespace violation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7857abd916c3dbc75c13443eb28f44437eb1f57 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:25 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl: clean up namespace violation In 752f181f ("libxl_json: introduce parser functions for builtin types") a bunch of parser functions were introduced. Unfortunately they polluted the public namespace with a prefix "libxl_", while they should be internal functions. This patch changes the prefix to "libxl__". No functional change introduced. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_cpuid.c | 6 +++--- tools/libxl/libxl_internal.h | 40 ++++++++++++++++++++-------------------- tools/libxl/libxl_json.c | 30 +++++++++++++++--------------- tools/libxl/libxl_nocpuid.c | 6 +++--- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 1706357..7f66678 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -403,9 +403,9 @@ out: return s; } -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p) +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p) { int i, size; libxl_cpuid_policy_list l; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7750dc5..07a3bdf 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3153,28 +3153,28 @@ static inline int libxl__defbool_is_default(libxl_defbool *db) */ #define CTYPE(isfoo,c) (isfoo((unsigned char)(c))) -int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_defbool *p); +int libxl__defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_defbool *p); int libxl__bool_parse_json(libxl__gc *gc, const libxl__json_object *o, bool *p); -int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_mac *p); -int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_bitmap *p); -int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_uuid *p); -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p); -int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_string_list *p); -int libxl_key_value_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_key_value_list *p); -int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_hwcap *p); -int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_ms_vm_genid *p); +int libxl__mac_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_mac *p); +int libxl__bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_bitmap *p); +int libxl__uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_uuid *p); +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p); +int libxl__string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_string_list *p); +int libxl__key_value_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_key_value_list *p); +int libxl__hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_hwcap *p); +int libxl__ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p); int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, void *p); int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 63125dc..ceb014a 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -100,8 +100,8 @@ yajl_gen_status libxl_defbool_gen_json(yajl_gen hand, return libxl__yajl_gen_asciiz(hand, libxl_defbool_to_string(*db)); } -int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_defbool *p) +int libxl__defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_defbool *p) { const char *s; @@ -144,8 +144,8 @@ yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_UUID_FMTLEN); } -int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_uuid *p) +int libxl__uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_uuid *p) { if (!libxl__json_object_is_string(o)) return ERROR_FAIL; @@ -173,7 +173,7 @@ out: return s; } -int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, +int libxl__bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, libxl_bitmap *p) { int i; @@ -234,8 +234,8 @@ out: return s; } -int libxl_key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_key_value_list *p) +int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_key_value_list *p) { libxl__json_map_node *node = NULL; flexarray_t *maps = NULL; @@ -290,8 +290,8 @@ out: return s; } -int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_string_list *p) +int libxl__string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_string_list *p) { const libxl__json_object *t; libxl_string_list l; @@ -329,8 +329,8 @@ yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *mac) return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_MAC_FMTLEN); } -int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_mac *p) +int libxl__mac_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_mac *p) { if (!libxl__json_object_is_string(o)) return ERROR_FAIL; @@ -356,8 +356,8 @@ out: return s; } -int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_hwcap *p) +int libxl__hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_hwcap *p) { int i; @@ -395,8 +395,8 @@ yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p) return yajl_gen_array_close(hand); } -int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_ms_vm_genid *p) +int libxl__ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p) { unsigned int i; diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index 96e6e2e..bab8911 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -49,9 +49,9 @@ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, return 0; } -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p) +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p) { 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 Sun Jul 13 19:24:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6PO4-0006Hh-VK; Sun, 13 Jul 2014 19:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PO4-0006HW-5l for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:40 +0000 Received: from [193.109.254.147:25786] by server-8.bemta-14.messagelabs.com id E6/87-14857-7FCD2C35; Sun, 13 Jul 2014 19:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405279477!17205966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20754 invoked from network); 13 Jul 2014 19:24:38 -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; 13 Jul 2014 19:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PO1-0003WO-FE for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PO1-00085S-Ci for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:37 +0000 Date: Sun, 13 Jul 2014 19:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clean up namespace violation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7857abd916c3dbc75c13443eb28f44437eb1f57 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:25 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl: clean up namespace violation In 752f181f ("libxl_json: introduce parser functions for builtin types") a bunch of parser functions were introduced. Unfortunately they polluted the public namespace with a prefix "libxl_", while they should be internal functions. This patch changes the prefix to "libxl__". No functional change introduced. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_cpuid.c | 6 +++--- tools/libxl/libxl_internal.h | 40 ++++++++++++++++++++-------------------- tools/libxl/libxl_json.c | 30 +++++++++++++++--------------- tools/libxl/libxl_nocpuid.c | 6 +++--- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 1706357..7f66678 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -403,9 +403,9 @@ out: return s; } -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p) +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p) { int i, size; libxl_cpuid_policy_list l; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7750dc5..07a3bdf 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3153,28 +3153,28 @@ static inline int libxl__defbool_is_default(libxl_defbool *db) */ #define CTYPE(isfoo,c) (isfoo((unsigned char)(c))) -int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_defbool *p); +int libxl__defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_defbool *p); int libxl__bool_parse_json(libxl__gc *gc, const libxl__json_object *o, bool *p); -int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_mac *p); -int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_bitmap *p); -int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_uuid *p); -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p); -int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_string_list *p); -int libxl_key_value_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_key_value_list *p); -int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_hwcap *p); -int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_ms_vm_genid *p); +int libxl__mac_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_mac *p); +int libxl__bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_bitmap *p); +int libxl__uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_uuid *p); +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p); +int libxl__string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_string_list *p); +int libxl__key_value_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_key_value_list *p); +int libxl__hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_hwcap *p); +int libxl__ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p); int libxl__int_parse_json(libxl__gc *gc, const libxl__json_object *o, void *p); int libxl__uint8_parse_json(libxl__gc *gc, const libxl__json_object *o, diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 63125dc..ceb014a 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -100,8 +100,8 @@ yajl_gen_status libxl_defbool_gen_json(yajl_gen hand, return libxl__yajl_gen_asciiz(hand, libxl_defbool_to_string(*db)); } -int libxl_defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_defbool *p) +int libxl__defbool_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_defbool *p) { const char *s; @@ -144,8 +144,8 @@ yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_UUID_FMTLEN); } -int libxl_uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_uuid *p) +int libxl__uuid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_uuid *p) { if (!libxl__json_object_is_string(o)) return ERROR_FAIL; @@ -173,7 +173,7 @@ out: return s; } -int libxl_bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, +int libxl__bitmap_parse_json(libxl__gc *gc, const libxl__json_object *o, libxl_bitmap *p) { int i; @@ -234,8 +234,8 @@ out: return s; } -int libxl_key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_key_value_list *p) +int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_key_value_list *p) { libxl__json_map_node *node = NULL; flexarray_t *maps = NULL; @@ -290,8 +290,8 @@ out: return s; } -int libxl_string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_string_list *p) +int libxl__string_list_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_string_list *p) { const libxl__json_object *t; libxl_string_list l; @@ -329,8 +329,8 @@ yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *mac) return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_MAC_FMTLEN); } -int libxl_mac_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_mac *p) +int libxl__mac_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_mac *p) { if (!libxl__json_object_is_string(o)) return ERROR_FAIL; @@ -356,8 +356,8 @@ out: return s; } -int libxl_hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_hwcap *p) +int libxl__hwcap_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_hwcap *p) { int i; @@ -395,8 +395,8 @@ yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p) return yajl_gen_array_close(hand); } -int libxl_ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, - libxl_ms_vm_genid *p) +int libxl__ms_vm_genid_parse_json(libxl__gc *gc, const libxl__json_object *o, + libxl_ms_vm_genid *p) { unsigned int i; diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index 96e6e2e..bab8911 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -49,9 +49,9 @@ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, return 0; } -int libxl_cpuid_policy_list_parse_json(libxl__gc *gc, - const libxl__json_object *o, - libxl_cpuid_policy_list *p) +int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, + const libxl__json_object *o, + libxl_cpuid_policy_list *p) { 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 Sun Jul 13 19:24:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6POG-0006JD-2N; Sun, 13 Jul 2014 19:24:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POF-0006J0-7w for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:51 +0000 Received: from [193.109.254.147:32026] by server-16.bemta-14.messagelabs.com id 8D/65-07101-20DD2C35; Sun, 13 Jul 2014 19:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1405279487!13859865!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19280 invoked from network); 13 Jul 2014 19:24:48 -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; 13 Jul 2014 19:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POB-0003WU-Ko for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POB-00085o-JF for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:47 +0000 Date: Sun, 13 Jul 2014 19:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4e5aea5d3c7c0abecda8fad8040eb63b5e82fa2 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:26 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct libxl_FOO_parse_json functions are generated. Note that these functions are used to parse libxl__json_object to libxl__FOO struct. They don't consume JSON string. The new function definitions are generated to new header files called __libxl_types_*_private.h so that they don't contaminate public header. The suffix "private is chosen so we can avoid clashing with libxl_types_internal.idl stuffs. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/Makefile | 8 +- tools/libxl/gentypes.py | 160 +++++++++++++++++++++++++++++++++- tools/libxl/idl.py | 20 ++++ tools/libxl/idl.txt | 7 ++- tools/libxl/libxl.h | 14 +++ tools/libxl/libxl_internal.h | 2 + tools/libxl/libxl_types.idl | 27 +++--- tools/libxl/libxl_types_internal.idl | 4 +- 8 files changed, 222 insertions(+), 20 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 78c1996..dd3dd8f 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -176,7 +176,7 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ libxl.h: _libxl_types.h libxl_json.h: _libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h @@ -184,9 +184,11 @@ $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h -_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py - $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c +_libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py + $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_private.h \ + __libxl_type$*_json.h __libxl_type$*.c $(call move-if-changed,__libxl_type$*.h,_libxl_type$*.h) + $(call move-if-changed,__libxl_type$*_private.h,_libxl_type$*_private.h) $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index f06afd9..6cdeaa8 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -312,6 +312,116 @@ def libxl_C_type_to_json(ty, v, indent = " "): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discriminator = None): + s = "" + if parent is None: + s += "int rc = 0;\n" + s += "const libxl__json_object *x = o;\n" + + if isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + lenvar = parent + ty.lenvar.name + s += "{\n" + s += " libxl__json_object *t;\n" + s += " int i;\n" + s += " if (!libxl__json_object_is_array(x)) {\n" + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " %s = x->u.array->count;\n" % lenvar + s += " %s = libxl__calloc(NOGC, %s, sizeof(*%s));\n" % (v, lenvar, v) + s += " if (!%s && %s != 0) {\n" % (v, lenvar) + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " for (i=0; (t=libxl__json_array_get(x,i)); i++) {\n" + s += libxl_C_type_parse_json(ty.elem_type, "t", v+"[i]", + indent + " ", parent) + s += " }\n" + s += " if (i != %s) {\n" % lenvar + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += "}\n" + elif isinstance(ty, idl.Enumeration): + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + s += "{\n" + s += " const char *enum_str;\n" + s += " if (!libxl__json_object_is_string(x)) {\n" + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " enum_str = libxl__json_object_get_string(x);\n" + s += " rc = %s_from_string(enum_str, %s);\n" % (ty.typename, ty.pass_arg(v, parent is None, idl.PASS_BY_REFERENCE)) + s += " if (rc)\n" + s += " goto out;\n" + s += "}\n" + elif isinstance(ty, idl.KeyedUnion): + if parent is None: + raise Exception("KeyedUnion type must have a parent") + if discriminator is None: + raise Excpetion("KeyedUnion type must have a discriminator") + for f in ty.fields: + if f.enumname != discriminator: + continue + (nparent,fexpr) = ty.member(v, f, parent is None) + if f.type is not None: + s += libxl_C_type_parse_json(f.type, w, fexpr, indent + " ", nparent) + elif isinstance(ty, idl.Struct) and (parent is None or ty.json_parse_fn is None): + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + for f in [f for f in ty.fields if not f.const and not f.type.private]: + saved_var_name = "saved_%s" % f.name + s += "{\n" + s += " const libxl__json_object *%s = NULL;\n" % saved_var_name + s += " %s = x;\n" % saved_var_name + if isinstance(f.type, idl.KeyedUnion): + for x in f.type.fields: + s += " x = libxl__json_map_get(\"%s\", %s, JSON_MAP);\n" % \ + (f.type.keyvar.name + "." + x.name, w) + s += " if (x) {\n" + (nparent, fexpr) = ty.member(v, f.type.keyvar, parent is None) + s += " %s_init_type(%s, %s);\n" % (ty.typename, v, x.enumname) + (nparent,fexpr) = ty.member(v, f, parent is None) + s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent, x.enumname) + s += " }\n" + else: + s += " x = libxl__json_map_get(\"%s\", %s, %s);\n" % (f.name, w, f.type.json_parse_type) + s += " if (x) {\n" + (nparent,fexpr) = ty.member(v, f, parent is None) + s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent) + s += " }\n" + s += " x = %s;\n" % saved_var_name + s += "}\n" + else: + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + if ty.json_parse_fn is not None: + s += "rc = %s(gc, %s, &%s);\n" % (ty.json_parse_fn, w, v) + s += "if (rc)\n" + s += " goto out;\n" + + if parent is None: + s += "out:\n" + s += "return rc;\n" + + if s != "": + s = indent +s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + +def libxl_C_type_from_json(ty, v, w, indent = " "): + s = "" + parse = "(libxl__json_parse_callback)&%s_parse_json" % (ty.namespace + "_" + ty.rawname) + s += "return libxl__object_from_json(ctx, \"%s\", %s, %s, %s);\n" % (ty.typename, parse, v, w) + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + def libxl_C_enum_to_string(ty, e, indent = " "): s = "" s += "switch(%s) {\n" % e @@ -350,11 +460,11 @@ def libxl_C_enum_from_string(ty, str, e, indent = " "): if __name__ == '__main__': - if len(sys.argv) != 5: - print >>sys.stderr, "Usage: gentypes.py
" + if len(sys.argv) != 6: + print >>sys.stderr, "Usage: gentypes.py
" sys.exit(1) - (_, idlname, header, header_json, impl) = sys.argv + (_, idlname, header, header_private, header_json, impl) = sys.argv (builtins,types) = idl.parse(idlname) @@ -390,6 +500,8 @@ if __name__ == '__main__': ku.keyvar.type.make_arg(ku.keyvar.name))) if ty.json_gen_fn is not None: f.write("%schar *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) + if ty.json_parse_fn is not None: + f.write("%sint %s_from_json(libxl_ctx *ctx, %s, const char *s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) if isinstance(ty, idl.Enumeration): f.write("%sconst char *%s_to_string(%s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) f.write("%sint %s_from_string(const char *s, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) @@ -423,6 +535,32 @@ if __name__ == '__main__': f.write("""#endif /* %s */\n""" % header_json_define) f.close() + print "outputting libxl type internal definitions to %s" % header_private + + f = open(header_private, "w") + + header_private_define = header_private.upper().replace('.','_') + f.write("""#ifndef %s +#define %s + +/* + * DO NOT EDIT. + * + * This file is autogenerated by + * "%s" + */ + +""" % (header_private_define, header_private_define, " ".join(sys.argv))) + + for ty in [ty for ty in types if ty.json_parse_fn is not None]: + f.write("%sint %s_parse_json(libxl__gc *gc, const libxl__json_object *o, %s);\n" % \ + (ty.hidden(), ty.namespace + "_" + ty.rawname, + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + + f.write("\n") + f.write("""#endif /* %s */\n""" % header_json_define) + f.close() + print "outputting libxl type implementations to %s" % impl f = open(impl, "w") @@ -486,4 +624,20 @@ if __name__ == '__main__': f.write("}\n") f.write("\n") + for ty in [t for t in types if t.json_parse_fn is not None]: + f.write("int %s_parse_json(libxl__gc *gc, const libxl__json_object *%s, %s)\n" % \ + (ty.namespace + "_" + ty.rawname,"o",ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + f.write(libxl_C_type_parse_json(ty, "o", "p")) + f.write("}\n") + f.write("\n") + + f.write("int %s_from_json(libxl_ctx *ctx, %s, const char *s)\n" % (ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + if not isinstance(ty, idl.Enumeration): + f.write(" %s_init(p);\n" % ty.typename) + f.write(libxl_C_type_from_json(ty, "p", "s")) + f.write("}\n") + f.write("\n") + f.close() diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index ada801a..63557db 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -68,8 +68,17 @@ class Type(object): if self.typename is not None and not self.private: self.json_gen_fn = kwargs.setdefault('json_gen_fn', self.typename + "_gen_json") + self.json_parse_type = kwargs.setdefault('json_parse_type', "JSON_ANY") + if self.namespace is not None: + self.json_parse_fn = kwargs.setdefault('json_parse_fn', + self.namespace + "_" + self.rawname + "_parse_json") + else: + self.json_parse_fn = kwargs.setdefault('json_parse_fn', + self.typename + "_parse_json") else: self.json_gen_fn = kwargs.setdefault('json_gen_fn', None) + self.json_parse_type = kwargs.setdefault('json_parse_type', None) + self.json_parse_fn = kwargs.setdefault('json_parse_fn', None) self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) @@ -121,6 +130,9 @@ class Number(Builtin): kwargs.setdefault('dispose_fn', None) kwargs.setdefault('signed', False) kwargs.setdefault('json_gen_fn', "yajl_gen_integer") + kwargs.setdefault('json_parse_type', "JSON_INTEGER") + # json_parse_fn might be overriden on specific type + kwargs.setdefault('json_parse_fn', "libxl__int_parse_json") self.signed = kwargs['signed'] Builtin.__init__(self, ctype, **kwargs) @@ -128,6 +140,7 @@ class UInt(Number): def __init__(self, w, **kwargs): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('json_parse_fn', "libxl__uint%d_parse_json" % w) Number.__init__(self, "uint%d_t" % w, **kwargs) self.width = w @@ -144,6 +157,7 @@ class EnumerationValue(object): class Enumeration(Type): def __init__(self, typename, values, **kwargs): kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('json_parse_type', "JSON_STRING") Type.__init__(self, typename, **kwargs) self.value_namespace = kwargs.setdefault('value_namespace', @@ -173,6 +187,7 @@ class Field(object): class Aggregate(Type): """A type containing a collection of other types""" def __init__(self, kind, typename, fields, **kwargs): + kwargs.setdefault('json_parse_type', "JSON_MAP") Type.__init__(self, typename, **kwargs) if self.typename is not None: @@ -259,6 +274,8 @@ class KeyedUnion(Aggregate): void = Builtin("void *", namespace = None) bool = Builtin("bool", namespace = None, json_gen_fn = "yajl_gen_bool", + json_parse_type = "JSON_BOOL", + json_parse_fn = "libxl__bool_parse_json", autogenerate_json = False) size_t = Number("size_t", namespace = None) @@ -272,12 +289,15 @@ uint64 = UInt(64, json_gen_fn = "libxl__uint64_gen_json") string = Builtin("char *", namespace = None, dispose_fn = "free", json_gen_fn = "libxl__string_gen_json", + json_parse_type = "JSON_STRING | JSON_NULL", + json_parse_fn = "libxl__string_parse_json", autogenerate_json = False) class Array(Type): """An array of the same type""" def __init__(self, elem_type, lenvar_name, **kwargs): kwargs.setdefault('dispose_fn', 'free') + kwargs.setdefault('json_parse_type', 'JSON_ARRAY') Type.__init__(self, namespace=elem_type.namespace, typename=elem_type.rawname + " *", **kwargs) lv_kwargs = dict([(x.lstrip('lenvar_'),y) for (x,y) in kwargs.items() if x.startswith('lenvar_')]) diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index d47eba8..87c4952 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -65,9 +65,14 @@ Type.json_gen_fn: (default: typename + "_gen_json" or None if type == None) The name of the C function which will generate a YAJL data structure representing this type. +Type.json_parse_fn: (default: typename + "_parse_json" or None if type == None) + + The name of the C function which will parse a libxl JSON structure + representing this type to C type. + Type.autogenerate_json: (default: True) - Indicates if the above named Type.json_gen_fn should be autogenerated. + Indicates if the above named Type.json_*_fn should be autogenerated. Type.check_default_fn: diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 459557d..4ab1617 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -317,6 +317,20 @@ * * Generates a JSON object from "p" in the form of a NULL terminated * string. + * + * libxl__from_json(const char *json) + * int libxl__from_json(const char *json) + * + * Parses "json" and returns: + * + * an int value, if is enumeration type. The value is the enum value + * representing the respective string in "json". + * + * an instance of , if is aggregate type. The returned + * instance has its fields filled in by the parser according to "json". + * + * If the parsing fails, caller cannot rely on the value / instance + * returned. */ #ifndef LIBXL_H #define LIBXL_H diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 07a3bdf..beb052e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3198,6 +3198,8 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); #else #define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) #endif +#include "_libxl_types_private.h" +#include "_libxl_types_internal_private.h" /* This always return false, there's no "default value" for hw cap */ static inline int libxl__hwcap_is_default(libxl_hwcap *hwcap) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 439095a..244075a 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,22 +5,25 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE, check_default_fn="libxl__defbool_is_default") - -libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False) -libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") -libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") -libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, +libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__defbool_is_default") + +libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", + json_parse_type = "JSON_INTEGER", autogenerate_json = False) +libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__int_parse_json", + json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1") +libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") +libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") +libxl_bitmap = Builtin("bitmap", json_parse_type="JSON_ARRAY", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, check_default_fn="libxl_bitmap_is_empty") libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__cpuid_policy_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty") libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__string_list_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty") libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__key_value_list_is_empty") -libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, + json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty") +libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, json_parse_type="JSON_ARRAY", check_default_fn="libxl__hwcap_is_default") libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") @@ -591,7 +594,7 @@ libxl_event_type = Enumeration("event_type", [ libxl_ev_user = UInt(64) -libxl_ev_link = Builtin("ev_link", passby=PASS_BY_REFERENCE, private=True) +libxl_ev_link = Builtin("ev_link", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, private=True) libxl_event = Struct("event",[ ("link", libxl_ev_link), diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index a964851..17533f1 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -1,7 +1,9 @@ namespace("libxl__") hidden(True) -libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer") +libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer", + json_parse_fn = "libxl__uint32_parse_json", json_parse_type = "JSON_INTEGER", + autogenerate_json = False) libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:24:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:24: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 1X6POG-0006JD-2N; Sun, 13 Jul 2014 19:24:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POF-0006J0-7w for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:51 +0000 Received: from [193.109.254.147:32026] by server-16.bemta-14.messagelabs.com id 8D/65-07101-20DD2C35; Sun, 13 Jul 2014 19:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1405279487!13859865!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19280 invoked from network); 13 Jul 2014 19:24:48 -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; 13 Jul 2014 19:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POB-0003WU-Ko for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POB-00085o-JF for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:47 +0000 Date: Sun, 13 Jul 2014 19:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4e5aea5d3c7c0abecda8fad8040eb63b5e82fa2 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:26 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct libxl_FOO_parse_json functions are generated. Note that these functions are used to parse libxl__json_object to libxl__FOO struct. They don't consume JSON string. The new function definitions are generated to new header files called __libxl_types_*_private.h so that they don't contaminate public header. The suffix "private is chosen so we can avoid clashing with libxl_types_internal.idl stuffs. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/Makefile | 8 +- tools/libxl/gentypes.py | 160 +++++++++++++++++++++++++++++++++- tools/libxl/idl.py | 20 ++++ tools/libxl/idl.txt | 7 ++- tools/libxl/libxl.h | 14 +++ tools/libxl/libxl_internal.h | 2 + tools/libxl/libxl_types.idl | 27 +++--- tools/libxl/libxl_types_internal.idl | 4 +- 8 files changed, 222 insertions(+), 20 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 78c1996..dd3dd8f 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -176,7 +176,7 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ libxl.h: _libxl_types.h libxl_json.h: _libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h @@ -184,9 +184,11 @@ $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h -_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py - $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c +_libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py + $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_private.h \ + __libxl_type$*_json.h __libxl_type$*.c $(call move-if-changed,__libxl_type$*.h,_libxl_type$*.h) + $(call move-if-changed,__libxl_type$*_private.h,_libxl_type$*_private.h) $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index f06afd9..6cdeaa8 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -312,6 +312,116 @@ def libxl_C_type_to_json(ty, v, indent = " "): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discriminator = None): + s = "" + if parent is None: + s += "int rc = 0;\n" + s += "const libxl__json_object *x = o;\n" + + if isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + lenvar = parent + ty.lenvar.name + s += "{\n" + s += " libxl__json_object *t;\n" + s += " int i;\n" + s += " if (!libxl__json_object_is_array(x)) {\n" + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " %s = x->u.array->count;\n" % lenvar + s += " %s = libxl__calloc(NOGC, %s, sizeof(*%s));\n" % (v, lenvar, v) + s += " if (!%s && %s != 0) {\n" % (v, lenvar) + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " for (i=0; (t=libxl__json_array_get(x,i)); i++) {\n" + s += libxl_C_type_parse_json(ty.elem_type, "t", v+"[i]", + indent + " ", parent) + s += " }\n" + s += " if (i != %s) {\n" % lenvar + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += "}\n" + elif isinstance(ty, idl.Enumeration): + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + s += "{\n" + s += " const char *enum_str;\n" + s += " if (!libxl__json_object_is_string(x)) {\n" + s += " rc = -1;\n" + s += " goto out;\n" + s += " }\n" + s += " enum_str = libxl__json_object_get_string(x);\n" + s += " rc = %s_from_string(enum_str, %s);\n" % (ty.typename, ty.pass_arg(v, parent is None, idl.PASS_BY_REFERENCE)) + s += " if (rc)\n" + s += " goto out;\n" + s += "}\n" + elif isinstance(ty, idl.KeyedUnion): + if parent is None: + raise Exception("KeyedUnion type must have a parent") + if discriminator is None: + raise Excpetion("KeyedUnion type must have a discriminator") + for f in ty.fields: + if f.enumname != discriminator: + continue + (nparent,fexpr) = ty.member(v, f, parent is None) + if f.type is not None: + s += libxl_C_type_parse_json(f.type, w, fexpr, indent + " ", nparent) + elif isinstance(ty, idl.Struct) and (parent is None or ty.json_parse_fn is None): + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + for f in [f for f in ty.fields if not f.const and not f.type.private]: + saved_var_name = "saved_%s" % f.name + s += "{\n" + s += " const libxl__json_object *%s = NULL;\n" % saved_var_name + s += " %s = x;\n" % saved_var_name + if isinstance(f.type, idl.KeyedUnion): + for x in f.type.fields: + s += " x = libxl__json_map_get(\"%s\", %s, JSON_MAP);\n" % \ + (f.type.keyvar.name + "." + x.name, w) + s += " if (x) {\n" + (nparent, fexpr) = ty.member(v, f.type.keyvar, parent is None) + s += " %s_init_type(%s, %s);\n" % (ty.typename, v, x.enumname) + (nparent,fexpr) = ty.member(v, f, parent is None) + s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent, x.enumname) + s += " }\n" + else: + s += " x = libxl__json_map_get(\"%s\", %s, %s);\n" % (f.name, w, f.type.json_parse_type) + s += " if (x) {\n" + (nparent,fexpr) = ty.member(v, f, parent is None) + s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent) + s += " }\n" + s += " x = %s;\n" % saved_var_name + s += "}\n" + else: + if discriminator is not None: + raise Exception("Only KeyedUnion can have discriminator") + if ty.json_parse_fn is not None: + s += "rc = %s(gc, %s, &%s);\n" % (ty.json_parse_fn, w, v) + s += "if (rc)\n" + s += " goto out;\n" + + if parent is None: + s += "out:\n" + s += "return rc;\n" + + if s != "": + s = indent +s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + +def libxl_C_type_from_json(ty, v, w, indent = " "): + s = "" + parse = "(libxl__json_parse_callback)&%s_parse_json" % (ty.namespace + "_" + ty.rawname) + s += "return libxl__object_from_json(ctx, \"%s\", %s, %s, %s);\n" % (ty.typename, parse, v, w) + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + def libxl_C_enum_to_string(ty, e, indent = " "): s = "" s += "switch(%s) {\n" % e @@ -350,11 +460,11 @@ def libxl_C_enum_from_string(ty, str, e, indent = " "): if __name__ == '__main__': - if len(sys.argv) != 5: - print >>sys.stderr, "Usage: gentypes.py
" + if len(sys.argv) != 6: + print >>sys.stderr, "Usage: gentypes.py
" sys.exit(1) - (_, idlname, header, header_json, impl) = sys.argv + (_, idlname, header, header_private, header_json, impl) = sys.argv (builtins,types) = idl.parse(idlname) @@ -390,6 +500,8 @@ if __name__ == '__main__': ku.keyvar.type.make_arg(ku.keyvar.name))) if ty.json_gen_fn is not None: f.write("%schar *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) + if ty.json_parse_fn is not None: + f.write("%sint %s_from_json(libxl_ctx *ctx, %s, const char *s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) if isinstance(ty, idl.Enumeration): f.write("%sconst char *%s_to_string(%s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) f.write("%sint %s_from_string(const char *s, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) @@ -423,6 +535,32 @@ if __name__ == '__main__': f.write("""#endif /* %s */\n""" % header_json_define) f.close() + print "outputting libxl type internal definitions to %s" % header_private + + f = open(header_private, "w") + + header_private_define = header_private.upper().replace('.','_') + f.write("""#ifndef %s +#define %s + +/* + * DO NOT EDIT. + * + * This file is autogenerated by + * "%s" + */ + +""" % (header_private_define, header_private_define, " ".join(sys.argv))) + + for ty in [ty for ty in types if ty.json_parse_fn is not None]: + f.write("%sint %s_parse_json(libxl__gc *gc, const libxl__json_object *o, %s);\n" % \ + (ty.hidden(), ty.namespace + "_" + ty.rawname, + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + + f.write("\n") + f.write("""#endif /* %s */\n""" % header_json_define) + f.close() + print "outputting libxl type implementations to %s" % impl f = open(impl, "w") @@ -486,4 +624,20 @@ if __name__ == '__main__': f.write("}\n") f.write("\n") + for ty in [t for t in types if t.json_parse_fn is not None]: + f.write("int %s_parse_json(libxl__gc *gc, const libxl__json_object *%s, %s)\n" % \ + (ty.namespace + "_" + ty.rawname,"o",ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + f.write(libxl_C_type_parse_json(ty, "o", "p")) + f.write("}\n") + f.write("\n") + + f.write("int %s_from_json(libxl_ctx *ctx, %s, const char *s)\n" % (ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + if not isinstance(ty, idl.Enumeration): + f.write(" %s_init(p);\n" % ty.typename) + f.write(libxl_C_type_from_json(ty, "p", "s")) + f.write("}\n") + f.write("\n") + f.close() diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index ada801a..63557db 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -68,8 +68,17 @@ class Type(object): if self.typename is not None and not self.private: self.json_gen_fn = kwargs.setdefault('json_gen_fn', self.typename + "_gen_json") + self.json_parse_type = kwargs.setdefault('json_parse_type', "JSON_ANY") + if self.namespace is not None: + self.json_parse_fn = kwargs.setdefault('json_parse_fn', + self.namespace + "_" + self.rawname + "_parse_json") + else: + self.json_parse_fn = kwargs.setdefault('json_parse_fn', + self.typename + "_parse_json") else: self.json_gen_fn = kwargs.setdefault('json_gen_fn', None) + self.json_parse_type = kwargs.setdefault('json_parse_type', None) + self.json_parse_fn = kwargs.setdefault('json_parse_fn', None) self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) @@ -121,6 +130,9 @@ class Number(Builtin): kwargs.setdefault('dispose_fn', None) kwargs.setdefault('signed', False) kwargs.setdefault('json_gen_fn', "yajl_gen_integer") + kwargs.setdefault('json_parse_type', "JSON_INTEGER") + # json_parse_fn might be overriden on specific type + kwargs.setdefault('json_parse_fn', "libxl__int_parse_json") self.signed = kwargs['signed'] Builtin.__init__(self, ctype, **kwargs) @@ -128,6 +140,7 @@ class UInt(Number): def __init__(self, w, **kwargs): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('json_parse_fn', "libxl__uint%d_parse_json" % w) Number.__init__(self, "uint%d_t" % w, **kwargs) self.width = w @@ -144,6 +157,7 @@ class EnumerationValue(object): class Enumeration(Type): def __init__(self, typename, values, **kwargs): kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('json_parse_type', "JSON_STRING") Type.__init__(self, typename, **kwargs) self.value_namespace = kwargs.setdefault('value_namespace', @@ -173,6 +187,7 @@ class Field(object): class Aggregate(Type): """A type containing a collection of other types""" def __init__(self, kind, typename, fields, **kwargs): + kwargs.setdefault('json_parse_type', "JSON_MAP") Type.__init__(self, typename, **kwargs) if self.typename is not None: @@ -259,6 +274,8 @@ class KeyedUnion(Aggregate): void = Builtin("void *", namespace = None) bool = Builtin("bool", namespace = None, json_gen_fn = "yajl_gen_bool", + json_parse_type = "JSON_BOOL", + json_parse_fn = "libxl__bool_parse_json", autogenerate_json = False) size_t = Number("size_t", namespace = None) @@ -272,12 +289,15 @@ uint64 = UInt(64, json_gen_fn = "libxl__uint64_gen_json") string = Builtin("char *", namespace = None, dispose_fn = "free", json_gen_fn = "libxl__string_gen_json", + json_parse_type = "JSON_STRING | JSON_NULL", + json_parse_fn = "libxl__string_parse_json", autogenerate_json = False) class Array(Type): """An array of the same type""" def __init__(self, elem_type, lenvar_name, **kwargs): kwargs.setdefault('dispose_fn', 'free') + kwargs.setdefault('json_parse_type', 'JSON_ARRAY') Type.__init__(self, namespace=elem_type.namespace, typename=elem_type.rawname + " *", **kwargs) lv_kwargs = dict([(x.lstrip('lenvar_'),y) for (x,y) in kwargs.items() if x.startswith('lenvar_')]) diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index d47eba8..87c4952 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -65,9 +65,14 @@ Type.json_gen_fn: (default: typename + "_gen_json" or None if type == None) The name of the C function which will generate a YAJL data structure representing this type. +Type.json_parse_fn: (default: typename + "_parse_json" or None if type == None) + + The name of the C function which will parse a libxl JSON structure + representing this type to C type. + Type.autogenerate_json: (default: True) - Indicates if the above named Type.json_gen_fn should be autogenerated. + Indicates if the above named Type.json_*_fn should be autogenerated. Type.check_default_fn: diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 459557d..4ab1617 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -317,6 +317,20 @@ * * Generates a JSON object from "p" in the form of a NULL terminated * string. + * + * libxl__from_json(const char *json) + * int libxl__from_json(const char *json) + * + * Parses "json" and returns: + * + * an int value, if is enumeration type. The value is the enum value + * representing the respective string in "json". + * + * an instance of , if is aggregate type. The returned + * instance has its fields filled in by the parser according to "json". + * + * If the parsing fails, caller cannot rely on the value / instance + * returned. */ #ifndef LIBXL_H #define LIBXL_H diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 07a3bdf..beb052e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3198,6 +3198,8 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len); #else #define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) #endif +#include "_libxl_types_private.h" +#include "_libxl_types_internal_private.h" /* This always return false, there's no "default value" for hw cap */ static inline int libxl__hwcap_is_default(libxl_hwcap *hwcap) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 439095a..244075a 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,22 +5,25 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE, check_default_fn="libxl__defbool_is_default") - -libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False) -libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") -libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") -libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, +libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, + check_default_fn="libxl__defbool_is_default") + +libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", + json_parse_type = "JSON_INTEGER", autogenerate_json = False) +libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__int_parse_json", + json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1") +libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") +libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") +libxl_bitmap = Builtin("bitmap", json_parse_type="JSON_ARRAY", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, check_default_fn="libxl_bitmap_is_empty") libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__cpuid_policy_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty") libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__string_list_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty") libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl__key_value_list_is_empty") -libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, + json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty") +libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, json_parse_type="JSON_ARRAY", check_default_fn="libxl__hwcap_is_default") libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") @@ -591,7 +594,7 @@ libxl_event_type = Enumeration("event_type", [ libxl_ev_user = UInt(64) -libxl_ev_link = Builtin("ev_link", passby=PASS_BY_REFERENCE, private=True) +libxl_ev_link = Builtin("ev_link", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, private=True) libxl_event = Struct("event",[ ("link", libxl_ev_link), diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index a964851..17533f1 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -1,7 +1,9 @@ namespace("libxl__") hidden(True) -libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer") +libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer", + json_parse_fn = "libxl__uint32_parse_json", json_parse_type = "JSON_INTEGER", + autogenerate_json = False) libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POP-0006Ky-7Z; Sun, 13 Jul 2014 19:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POO-0006Kn-DY for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:00 +0000 Received: from [85.158.139.211:59963] by server-12.bemta-5.messagelabs.com id B2/8C-27841-B0DD2C35; Sun, 13 Jul 2014 19:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1405279497!15281857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28529 invoked from network); 13 Jul 2014 19:24:58 -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; 13 Jul 2014 19:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POL-0003Wd-Po for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POL-00086h-OC for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:57 +0000 Date: Sun, 13 Jul 2014 19:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentest.py: test JSON parser X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfcbf58912978aa7bd845b5e860d23d408acd46 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:27 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentest.py: test JSON parser The test is done in following steps: 1. initialise libxl_FOO struct 2. generate JSON string A for libxl_FOO struct FOO1 3. convert JSON string A to libxl_FOO struct FOO2 4. generate JSON string B for libxl_FOO struct FOO2 5. compare A and B If A and B are identical then we are good. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 0195bf4..4f6435e 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -225,10 +225,11 @@ int main(int argc, char **argv) """) for ty in types: - f.write(" %s %s_val;\n" % (ty.typename, ty.typename)) + f.write(" %s %s_val, %s_val_new;\n" % \ + (ty.typename, ty.typename, ty.typename)) f.write(""" int rc; - char *s; + char *s, *new_s; xentoollog_logger_stdiostream *logger; libxl_ctx *ctx; @@ -240,20 +241,36 @@ int main(int argc, char **argv) exit(1); } """) - f.write(" printf(\"Testing TYPE_to_json()\\n\");\n") + f.write(" printf(\"Testing TYPE_to/from_json()\\n\");\n") f.write(" printf(\"----------------------\\n\");\n") f.write(" printf(\"\\n\");\n") for ty in [t for t in types if t.json_gen_fn is not None]: arg = ty.typename + "_val" f.write(" %s_rand_init(%s);\n" % (ty.typename, \ ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + if not isinstance(ty, idl.Enumeration): + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) f.write(" if (s == NULL) abort();\n") + f.write(" rc = %s_from_json(ctx, &%s_val_new, s);\n" % \ + (ty.typename, ty.typename)) + f.write(" if (rc) abort();\n") + f.write(" new_s = %s_to_json(ctx, %s_new);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (new_s == NULL) abort();\n") + f.write(" if (strcmp(s, new_s)) {\n") + f.write(" printf(\"Huh? Regenerated string different from original string.\\n\");\n") + f.write(" printf(\"Regenerated string: %s\\n\", new_s);\n") + f.write(" abort();\n") + f.write(" }\n") f.write(" free(s);\n") + f.write(" free(new_s);\n") if ty.dispose_fn is not None: f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) f.write("\n") f.write(" printf(\"Testing Enumerations\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POP-0006Ky-7Z; Sun, 13 Jul 2014 19:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POO-0006Kn-DY for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:00 +0000 Received: from [85.158.139.211:59963] by server-12.bemta-5.messagelabs.com id B2/8C-27841-B0DD2C35; Sun, 13 Jul 2014 19:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1405279497!15281857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28529 invoked from network); 13 Jul 2014 19:24:58 -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; 13 Jul 2014 19:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POL-0003Wd-Po for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POL-00086h-OC for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:24:57 +0000 Date: Sun, 13 Jul 2014 19:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentest.py: test JSON parser X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfcbf58912978aa7bd845b5e860d23d408acd46 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:27 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentest.py: test JSON parser The test is done in following steps: 1. initialise libxl_FOO struct 2. generate JSON string A for libxl_FOO struct FOO1 3. convert JSON string A to libxl_FOO struct FOO2 4. generate JSON string B for libxl_FOO struct FOO2 5. compare A and B If A and B are identical then we are good. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 0195bf4..4f6435e 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -225,10 +225,11 @@ int main(int argc, char **argv) """) for ty in types: - f.write(" %s %s_val;\n" % (ty.typename, ty.typename)) + f.write(" %s %s_val, %s_val_new;\n" % \ + (ty.typename, ty.typename, ty.typename)) f.write(""" int rc; - char *s; + char *s, *new_s; xentoollog_logger_stdiostream *logger; libxl_ctx *ctx; @@ -240,20 +241,36 @@ int main(int argc, char **argv) exit(1); } """) - f.write(" printf(\"Testing TYPE_to_json()\\n\");\n") + f.write(" printf(\"Testing TYPE_to/from_json()\\n\");\n") f.write(" printf(\"----------------------\\n\");\n") f.write(" printf(\"\\n\");\n") for ty in [t for t in types if t.json_gen_fn is not None]: arg = ty.typename + "_val" f.write(" %s_rand_init(%s);\n" % (ty.typename, \ ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + if not isinstance(ty, idl.Enumeration): + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) f.write(" if (s == NULL) abort();\n") + f.write(" rc = %s_from_json(ctx, &%s_val_new, s);\n" % \ + (ty.typename, ty.typename)) + f.write(" if (rc) abort();\n") + f.write(" new_s = %s_to_json(ctx, %s_new);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (new_s == NULL) abort();\n") + f.write(" if (strcmp(s, new_s)) {\n") + f.write(" printf(\"Huh? Regenerated string different from original string.\\n\");\n") + f.write(" printf(\"Regenerated string: %s\\n\", new_s);\n") + f.write(" abort();\n") + f.write(" }\n") f.write(" free(s);\n") + f.write(" free(new_s);\n") if ty.dispose_fn is not None: f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) f.write("\n") f.write(" printf(\"Testing Enumerations\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POa-0006Mv-AO; Sun, 13 Jul 2014 19:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POZ-0006Md-5j for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:11 +0000 Received: from [193.109.254.147:32590] by server-5.bemta-14.messagelabs.com id BD/2E-31950-61DD2C35; Sun, 13 Jul 2014 19:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405279508!17205996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22239 invoked from network); 13 Jul 2014 19:25:09 -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; 13 Jul 2014 19:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POW-0003XA-64 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POW-00087I-2b for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:08 +0000 Date: Sun, 13 Jul 2014 19:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: copy function for builtin 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 de18e4c038306aeeca53e6e63e563036cafef162 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:28 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl: copy function for builtin types These functions will be used in later patch to deep-copy a structure. Functions introduced: * libxl_string_list_copy * libxl_key_value_list_copy * libxl_hwcap_copy * libxl_mac_copy * libxl_cpuid_policy_list_copy * libxl_string_copy * libxl_bitmap_copy_alloc * libxl_ms_vm_genid_copy Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 67 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 14 +++++++++ tools/libxl/libxl_cpuid.c | 33 +++++++++++++++++++++ tools/libxl/libxl_genid.c | 6 ++++ tools/libxl/libxl_nocpuid.c | 6 ++++ tools/libxl/libxl_utils.c | 25 ++++++++++++++++ tools/libxl/libxl_utils.h | 4 ++ 7 files changed, 155 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c272b8d..a9205d1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -205,6 +205,29 @@ void libxl_string_list_dispose(libxl_string_list *psl) free(sl); } +void libxl_string_list_copy(libxl_ctx *ctx, + libxl_string_list *dst, + libxl_string_list *src) +{ + GC_INIT(ctx); + int i, len; + + if (!*src) { + *dst = NULL; + goto out; + } + + len = libxl_string_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len + 1, sizeof(char *)); + + for (i = 0; i < len; i++) + (*dst)[i] = libxl__strdup(NOGC, (*src)[i]); + +out: + GC_FREE; +} + int libxl_string_list_length(const libxl_string_list *psl) { int i = 0; @@ -245,6 +268,34 @@ void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) free(kvl); } +void libxl_key_value_list_copy(libxl_ctx *ctx, + libxl_key_value_list *dst, + libxl_key_value_list *src) +{ + GC_INIT(ctx); + int i, len; + + if (*src == NULL) { + *dst = NULL; + goto out; + } + + len = libxl_key_value_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len * 2 + 1, sizeof(char *)); + + for (i = 0; i < len * 2; i += 2) { + (*dst)[i] = libxl__strdup(NOGC, (*src)[i]); + if ((*src)[i+1]) + (*dst)[i+1] = libxl__strdup(NOGC, (*src)[i+1]); + else + (*dst)[i+1] = NULL; + } + +out: + GC_FREE; +} + void libxl_defbool_set(libxl_defbool *db, bool b) { db->val = b ? LIBXL__DEFBOOL_TRUE : LIBXL__DEFBOOL_FALSE; @@ -5769,6 +5820,22 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } + +void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) +{ + int i; + + for (i = 0; i < 8; i++) + (*dst)[i] = (*src)[i]; +} + +void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src) +{ + int i; + + for (i = 0; i < 6; i++) + (*dst)[i] = (*src)[i]; +} /* * Local variables: * mode: C diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 4ab1617..e6e0301 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -579,20 +579,29 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 +typedef struct libxl__ctx libxl_ctx; + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ #define LIBXL_MAC_BYTES(mac) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] +void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); +void libxl_string_list_copy(libxl_ctx *ctx, libxl_string_list *dst, + libxl_string_list *src); typedef char **libxl_key_value_list; void libxl_key_value_list_dispose(libxl_key_value_list *kvl); int libxl_key_value_list_length(libxl_key_value_list *kvl); +void libxl_key_value_list_copy(libxl_ctx *ctx, + libxl_key_value_list *dst, + libxl_key_value_list *src); typedef uint32_t libxl_hwcap[8]; +void libxl_hwcap_copy(libxl_ctx *ctx, libxl_hwcap *dst, libxl_hwcap *src); typedef uint64_t libxl_ev_user; @@ -611,6 +620,9 @@ typedef struct libxl__cpuid_policy libxl_cpuid_policy; typedef libxl_cpuid_policy * libxl_cpuid_policy_list; void libxl_cpuid_dispose(libxl_cpuid_policy_list *cpuid_list); int libxl_cpuid_policy_list_length(libxl_cpuid_policy_list *l); +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src); #define LIBXL_PCI_FUNC_ALL (~0U) @@ -1288,6 +1300,8 @@ int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id); bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id); +void libxl_ms_vm_genid_copy(libxl_ctx *ctx, libxl_ms_vm_genid *dst, + libxl_ms_vm_genid *src); /* misc */ diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 7f66678..7cfa6b7 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -473,6 +473,39 @@ int libxl_cpuid_policy_list_length(libxl_cpuid_policy_list *pl) return i; } +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src) +{ + GC_INIT(ctx); + int i, j, len; + + if (*src == NULL) { + *dst = NULL; + goto out; + } + + len = libxl_cpuid_policy_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len + 1, sizeof(libxl_cpuid_policy)); + (*dst)[len].input[0] = XEN_CPUID_INPUT_UNUSED; + (*dst)[len].input[1] = XEN_CPUID_INPUT_UNUSED; + + for (i = 0; i < len; i++) { + for (j = 0; j < 2; j++) + (*dst)[i].input[j] = (*src)[i].input[j]; + for (j = 0; j < 4; j++) + if ((*src)[i].policy[j]) + (*dst)[i].policy[j] = + libxl__strdup(NOGC, (*src)[i].policy[j]); + else + (*dst)[i].policy[j] = NULL; + } + +out: + GC_FREE; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c index 9853fa6..4e2f013 100644 --- a/tools/libxl/libxl_genid.c +++ b/tools/libxl/libxl_genid.c @@ -51,6 +51,12 @@ bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id) return memcmp(id->bytes, zero.bytes, LIBXL_MS_VM_GENID_LEN) == 0; } +void libxl_ms_vm_genid_copy(libxl_ctx *ctx, libxl_ms_vm_genid *dst, + libxl_ms_vm_genid *src) +{ + memcpy(dst, src, LIBXL_MS_VM_GENID_LEN); +} + int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, const libxl_ms_vm_genid *id) { diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index bab8911..3dcaef2 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -56,6 +56,12 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, return 0; } +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src) +{ +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 0001ab8..1fdf5ea 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -614,6 +614,19 @@ void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); } +void libxl_bitmap_copy_alloc(libxl_ctx *ctx, + libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + GC_INIT(ctx); + + dptr->map = libxl__calloc(NOGC, sptr->size, sizeof(*sptr->map)); + dptr->size = sptr->size; + memcpy(dptr->map, sptr->map, sptr->size * sizeof(*sptr->map)); + + GC_FREE; +} + int libxl_bitmap_is_full(const libxl_bitmap *bitmap) { int i; @@ -1013,6 +1026,18 @@ int libxl_domid_valid_guest(uint32_t domid) return domid > 0 && domid < DOMID_FIRST_RESERVED; } +void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src) +{ + GC_INIT(ctx); + + if (*src) + *dst = libxl__strdup(NOGC, *src); + else + *dst = NULL; + + GC_FREE; +} + /* * Fill @buf with @len random bytes. */ diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 13b42a1..117b229 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -76,6 +76,8 @@ int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ +void libxl_bitmap_copy_alloc(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr); void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, const libxl_bitmap *sptr); int libxl_bitmap_is_full(const libxl_bitmap *bitmap); @@ -146,6 +148,8 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, return (s + 1023) / 1024; } +void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src); + #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 Sun Jul 13 19:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POa-0006Mv-AO; Sun, 13 Jul 2014 19:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POZ-0006Md-5j for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:11 +0000 Received: from [193.109.254.147:32590] by server-5.bemta-14.messagelabs.com id BD/2E-31950-61DD2C35; Sun, 13 Jul 2014 19:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405279508!17205996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22239 invoked from network); 13 Jul 2014 19:25:09 -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; 13 Jul 2014 19:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POW-0003XA-64 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POW-00087I-2b for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:08 +0000 Date: Sun, 13 Jul 2014 19:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: copy function for builtin 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 de18e4c038306aeeca53e6e63e563036cafef162 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:28 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl: copy function for builtin types These functions will be used in later patch to deep-copy a structure. Functions introduced: * libxl_string_list_copy * libxl_key_value_list_copy * libxl_hwcap_copy * libxl_mac_copy * libxl_cpuid_policy_list_copy * libxl_string_copy * libxl_bitmap_copy_alloc * libxl_ms_vm_genid_copy Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 67 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 14 +++++++++ tools/libxl/libxl_cpuid.c | 33 +++++++++++++++++++++ tools/libxl/libxl_genid.c | 6 ++++ tools/libxl/libxl_nocpuid.c | 6 ++++ tools/libxl/libxl_utils.c | 25 ++++++++++++++++ tools/libxl/libxl_utils.h | 4 ++ 7 files changed, 155 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c272b8d..a9205d1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -205,6 +205,29 @@ void libxl_string_list_dispose(libxl_string_list *psl) free(sl); } +void libxl_string_list_copy(libxl_ctx *ctx, + libxl_string_list *dst, + libxl_string_list *src) +{ + GC_INIT(ctx); + int i, len; + + if (!*src) { + *dst = NULL; + goto out; + } + + len = libxl_string_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len + 1, sizeof(char *)); + + for (i = 0; i < len; i++) + (*dst)[i] = libxl__strdup(NOGC, (*src)[i]); + +out: + GC_FREE; +} + int libxl_string_list_length(const libxl_string_list *psl) { int i = 0; @@ -245,6 +268,34 @@ void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) free(kvl); } +void libxl_key_value_list_copy(libxl_ctx *ctx, + libxl_key_value_list *dst, + libxl_key_value_list *src) +{ + GC_INIT(ctx); + int i, len; + + if (*src == NULL) { + *dst = NULL; + goto out; + } + + len = libxl_key_value_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len * 2 + 1, sizeof(char *)); + + for (i = 0; i < len * 2; i += 2) { + (*dst)[i] = libxl__strdup(NOGC, (*src)[i]); + if ((*src)[i+1]) + (*dst)[i+1] = libxl__strdup(NOGC, (*src)[i+1]); + else + (*dst)[i+1] = NULL; + } + +out: + GC_FREE; +} + void libxl_defbool_set(libxl_defbool *db, bool b) { db->val = b ? LIBXL__DEFBOOL_TRUE : LIBXL__DEFBOOL_FALSE; @@ -5769,6 +5820,22 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } + +void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) +{ + int i; + + for (i = 0; i < 8; i++) + (*dst)[i] = (*src)[i]; +} + +void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src) +{ + int i; + + for (i = 0; i < 6; i++) + (*dst)[i] = (*src)[i]; +} /* * Local variables: * mode: C diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 4ab1617..e6e0301 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -579,20 +579,29 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 +typedef struct libxl__ctx libxl_ctx; + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ #define LIBXL_MAC_BYTES(mac) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] +void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); +void libxl_string_list_copy(libxl_ctx *ctx, libxl_string_list *dst, + libxl_string_list *src); typedef char **libxl_key_value_list; void libxl_key_value_list_dispose(libxl_key_value_list *kvl); int libxl_key_value_list_length(libxl_key_value_list *kvl); +void libxl_key_value_list_copy(libxl_ctx *ctx, + libxl_key_value_list *dst, + libxl_key_value_list *src); typedef uint32_t libxl_hwcap[8]; +void libxl_hwcap_copy(libxl_ctx *ctx, libxl_hwcap *dst, libxl_hwcap *src); typedef uint64_t libxl_ev_user; @@ -611,6 +620,9 @@ typedef struct libxl__cpuid_policy libxl_cpuid_policy; typedef libxl_cpuid_policy * libxl_cpuid_policy_list; void libxl_cpuid_dispose(libxl_cpuid_policy_list *cpuid_list); int libxl_cpuid_policy_list_length(libxl_cpuid_policy_list *l); +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src); #define LIBXL_PCI_FUNC_ALL (~0U) @@ -1288,6 +1300,8 @@ int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); int libxl_ms_vm_genid_generate(libxl_ctx *ctx, libxl_ms_vm_genid *id); bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id); +void libxl_ms_vm_genid_copy(libxl_ctx *ctx, libxl_ms_vm_genid *dst, + libxl_ms_vm_genid *src); /* misc */ diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 7f66678..7cfa6b7 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -473,6 +473,39 @@ int libxl_cpuid_policy_list_length(libxl_cpuid_policy_list *pl) return i; } +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src) +{ + GC_INIT(ctx); + int i, j, len; + + if (*src == NULL) { + *dst = NULL; + goto out; + } + + len = libxl_cpuid_policy_list_length(src); + /* one extra slot for sentinel */ + *dst = libxl__calloc(NOGC, len + 1, sizeof(libxl_cpuid_policy)); + (*dst)[len].input[0] = XEN_CPUID_INPUT_UNUSED; + (*dst)[len].input[1] = XEN_CPUID_INPUT_UNUSED; + + for (i = 0; i < len; i++) { + for (j = 0; j < 2; j++) + (*dst)[i].input[j] = (*src)[i].input[j]; + for (j = 0; j < 4; j++) + if ((*src)[i].policy[j]) + (*dst)[i].policy[j] = + libxl__strdup(NOGC, (*src)[i].policy[j]); + else + (*dst)[i].policy[j] = NULL; + } + +out: + GC_FREE; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c index 9853fa6..4e2f013 100644 --- a/tools/libxl/libxl_genid.c +++ b/tools/libxl/libxl_genid.c @@ -51,6 +51,12 @@ bool libxl_ms_vm_genid_is_zero(const libxl_ms_vm_genid *id) return memcmp(id->bytes, zero.bytes, LIBXL_MS_VM_GENID_LEN) == 0; } +void libxl_ms_vm_genid_copy(libxl_ctx *ctx, libxl_ms_vm_genid *dst, + libxl_ms_vm_genid *src) +{ + memcpy(dst, src, LIBXL_MS_VM_GENID_LEN); +} + int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, const libxl_ms_vm_genid *id) { diff --git a/tools/libxl/libxl_nocpuid.c b/tools/libxl/libxl_nocpuid.c index bab8911..3dcaef2 100644 --- a/tools/libxl/libxl_nocpuid.c +++ b/tools/libxl/libxl_nocpuid.c @@ -56,6 +56,12 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, return 0; } +void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, + libxl_cpuid_policy_list *dst, + libxl_cpuid_policy_list *src) +{ +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 0001ab8..1fdf5ea 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -614,6 +614,19 @@ void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); } +void libxl_bitmap_copy_alloc(libxl_ctx *ctx, + libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + GC_INIT(ctx); + + dptr->map = libxl__calloc(NOGC, sptr->size, sizeof(*sptr->map)); + dptr->size = sptr->size; + memcpy(dptr->map, sptr->map, sptr->size * sizeof(*sptr->map)); + + GC_FREE; +} + int libxl_bitmap_is_full(const libxl_bitmap *bitmap) { int i; @@ -1013,6 +1026,18 @@ int libxl_domid_valid_guest(uint32_t domid) return domid > 0 && domid < DOMID_FIRST_RESERVED; } +void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src) +{ + GC_INIT(ctx); + + if (*src) + *dst = libxl__strdup(NOGC, *src); + else + *dst = NULL; + + GC_FREE; +} + /* * Fill @buf with @len random bytes. */ diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 13b42a1..117b229 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -76,6 +76,8 @@ int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ +void libxl_bitmap_copy_alloc(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr); void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, const libxl_bitmap *sptr); int libxl_bitmap_is_full(const libxl_bitmap *bitmap); @@ -146,6 +148,8 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, return (s + 1023) / 1024; } +void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src); + #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 Sun Jul 13 19:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POl-0006OZ-DF; Sun, 13 Jul 2014 19:25:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POj-0006OF-Ib for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:21 +0000 Received: from [85.158.143.35:57378] by server-3.bemta-4.messagelabs.com id AC/C3-09960-02DD2C35; Sun, 13 Jul 2014 19:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1405279518!9391219!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26458 invoked from network); 13 Jul 2014 19:25:19 -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; 13 Jul 2014 19:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POg-0003XG-CV for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POg-00087g-Ab for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:18 +0000 Date: Sun, 13 Jul 2014 19:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: generate deep copy 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 f1f1881a195a881748567c69e980518847ce3007 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:29 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl IDL: generate deep copy functions Introduces copy_fn for a type. For most builtin types we can use direct assignment. For those builtin types which cannot use direct assignment we use the copy functions in previous patch. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 67 ++++++++++++++++++++++++++++++++++ tools/libxl/idl.py | 13 ++++++- tools/libxl/idl.txt | 12 ++++++ tools/libxl/libxl_types.idl | 30 +++++++++------ tools/libxl/libxl_types_internal.idl | 2 +- 5 files changed, 110 insertions(+), 14 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 6cdeaa8..4b0c996 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -100,6 +100,61 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_type_copy(ty, v, w, indent = " ", vparent = None, wparent = None): + s = "" + + if vparent is None: + s += "GC_INIT(ctx);\n"; + + if isinstance(ty, idl.KeyedUnion): + if vparent is None or wparent is None: + raise Exception("KeyedUnion type must have a parent") + s += "%s = %s;\n" % ((vparent + ty.keyvar.name), (wparent + ty.keyvar.name)) + s += "switch (%s) {\n" % (wparent + ty.keyvar.name) + for f in ty.fields: + (vnparent,vfexpr) = ty.member(v, f, vparent is None) + (wnparent,wfexpr) = ty.member(w, f, wparent is None) + s += "case %s:\n" % f.enumname + if f.type is not None: + s += libxl_C_type_copy(f.type, vfexpr, wfexpr, indent + " ", + vnparent, wnparent) + s += " break;\n" + s += "}\n" + elif isinstance(ty, idl.Array): + if vparent is None or wparent is None: + raise Exception("Array type must have a parent") + s += "%s = libxl__calloc(NOGC, %s, sizeof(*%s));\n" % (ty.pass_arg(v, vparent is None), + (wparent + ty.lenvar.name), + ty.pass_arg(w, wparent is None)) + s += "%s = %s;\n" % ((vparent + ty.lenvar.name), (wparent + ty.lenvar.name)) + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (wparent + ty.lenvar.name) + s += libxl_C_type_copy(ty.elem_type, v+"[i]", w+"[i]", + indent + " ", vparent, wparent) + s += "}\n" + elif isinstance(ty, idl.Struct) and ((vparent is None and wparent is None) or ty.copy_fn is None): + for f in [f for f in ty.fields if not f.const and not f.type.private]: + (vnparent,vfexpr) = ty.member(v, f, vparent is None) + (wnparent,wfexpr) = ty.member(w, f, wparent is None) + s += libxl_C_type_copy(f.type, vfexpr, wfexpr, "", vnparent, wnparent) + else: + if ty.copy_fn is not None: + s += "%s(ctx, %s, %s);\n" % (ty.copy_fn, + ty.pass_arg(v, vparent is None, passby=idl.PASS_BY_REFERENCE), + ty.pass_arg(w, wparent is None, passby=idl.PASS_BY_REFERENCE)) + + else: + s += "%s = %s;\n" % (ty.pass_arg(v, vparent is None, passby=idl.PASS_BY_VALUE), + ty.pass_arg(w, wparent is None, passby=idl.PASS_BY_VALUE)) + + if vparent is None: + s += "GC_FREE;\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + def libxl_init_members(ty, nesting = 0): """Returns a list of members of ty which require a separate init""" @@ -489,6 +544,9 @@ if __name__ == '__main__': f.write(libxl_C_type_define(ty) + ";\n") if ty.dispose_fn is not None: f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.dispose_fn, ty.make_arg("p"))) + if ty.copy_fn is not None: + f.write("%svoid %s(libxl_ctx *ctx, %s, %s);\n" % (ty.hidden(), ty.copy_fn, + ty.make_arg("dst"), ty.make_arg("src"))) if ty.init_fn is not None: f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.init_fn, ty.make_arg("p"))) for field in libxl_init_members(ty): @@ -590,6 +648,15 @@ if __name__ == '__main__': f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") f.write("}\n") f.write("\n") + + for ty in [t for t in types if t.copy_fn and t.autogenerate_copy_fn]: + f.write("void %s(libxl_ctx *ctx, %s, %s)\n" % (ty.copy_fn, + ty.make_arg("dst", passby=idl.PASS_BY_REFERENCE), + ty.make_arg("src", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + f.write(libxl_C_type_copy(ty, "dst", "src")) + f.write("}\n") + f.write("\n") for ty in [t for t in types if t.init_fn is not None and t.autogenerate_init_fn]: f.write(libxl_C_type_init(ty)) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 63557db..437049e 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -60,6 +60,13 @@ class Type(object): self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) + if self.typename is not None: + self.copy_fn = kwargs.setdefault('copy_fn', self.typename + "_copy") + else: + self.copy_fn = kwargs.setdefault('copy_fn', None) + + self.autogenerate_copy_fn = kwargs.setdefault('autogenerate_copy_fn', True) + self.init_fn = kwargs.setdefault('init_fn', None) self.init_val = kwargs.setdefault('init_val', None) self.autogenerate_init_fn = kwargs.setdefault('autogenerate_init_fn', False) @@ -128,6 +135,7 @@ class Number(Builtin): def __init__(self, ctype, **kwargs): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('copy_fn', None) kwargs.setdefault('signed', False) kwargs.setdefault('json_gen_fn', "yajl_gen_integer") kwargs.setdefault('json_parse_type', "JSON_INTEGER") @@ -141,6 +149,7 @@ class UInt(Number): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) kwargs.setdefault('json_parse_fn', "libxl__uint%d_parse_json" % w) + kwargs.setdefault('copy_fn', None) Number.__init__(self, "uint%d_t" % w, **kwargs) self.width = w @@ -157,6 +166,7 @@ class EnumerationValue(object): class Enumeration(Type): def __init__(self, typename, values, **kwargs): kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('copy_fn', None) kwargs.setdefault('json_parse_type', "JSON_STRING") Type.__init__(self, typename, **kwargs) @@ -273,6 +283,7 @@ class KeyedUnion(Aggregate): void = Builtin("void *", namespace = None) bool = Builtin("bool", namespace = None, + copy_fn=None, json_gen_fn = "yajl_gen_bool", json_parse_type = "JSON_BOOL", json_parse_fn = "libxl__bool_parse_json", @@ -287,7 +298,7 @@ uint16 = UInt(16) uint32 = UInt(32) uint64 = UInt(64, json_gen_fn = "libxl__uint64_gen_json") -string = Builtin("char *", namespace = None, dispose_fn = "free", +string = Builtin("char *", namespace = None, copy_fn = "libxl_string_copy", dispose_fn = "free", json_gen_fn = "libxl__string_gen_json", json_parse_type = "JSON_STRING | JSON_NULL", json_parse_fn = "libxl__string_parse_json", diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 87c4952..7440fb3 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -44,6 +44,18 @@ Type.autogenerate_dispose_fn: (default: True) Indicates if the above named Type.dispose_fn should be autogenerated. +Type.copy_fn: (default: typename + "_copy" or None if type == None) + + The name of the C function which will deep copy all fields within + this type. + +Type.autogenerate_copy_fn: (default: True) + + Indicates if the above named Type.copy_fn should be + autogenerated. + +Type.autogenerate_copy_fn + Type.init_val: (default: None) C expression for the value to initialise instances of this type to. diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 244075a..a412f9c 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,27 +5,33 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, +libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, copy_fn=None, check_default_fn="libxl__defbool_is_default") - libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", - json_parse_type = "JSON_INTEGER", autogenerate_json = False) + json_parse_type = "JSON_INTEGER", autogenerate_json = False, copy_fn=None) libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__int_parse_json", - json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") -libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") + json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1", + copy_fn=None) +libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil", + copy_fn="libxl_uuid_copy") +libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default", + copy_fn="libxl_mac_copy") libxl_bitmap = Builtin("bitmap", json_parse_type="JSON_ARRAY", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl_bitmap_is_empty") + check_default_fn="libxl_bitmap_is_empty", copy_fn="libxl_bitmap_copy_alloc") libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty", + copy_fn="libxl_cpuid_policy_list_copy") libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty", + copy_fn="libxl_string_list_copy") libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty") + json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty", + copy_fn="libxl_key_value_list_copy") libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, json_parse_type="JSON_ARRAY", - check_default_fn="libxl__hwcap_is_default") -libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") + check_default_fn="libxl__hwcap_is_default", copy_fn="libxl_hwcap_copy") +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero", + copy_fn="libxl_ms_vm_genid_copy") # # Specific integer types diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index 17533f1..800361b 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -3,7 +3,7 @@ hidden(True) libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", json_parse_type = "JSON_INTEGER", - autogenerate_json = False) + autogenerate_json = False, copy_fn = None) libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POl-0006OZ-DF; Sun, 13 Jul 2014 19:25:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POj-0006OF-Ib for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:21 +0000 Received: from [85.158.143.35:57378] by server-3.bemta-4.messagelabs.com id AC/C3-09960-02DD2C35; Sun, 13 Jul 2014 19:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1405279518!9391219!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26458 invoked from network); 13 Jul 2014 19:25:19 -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; 13 Jul 2014 19:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POg-0003XG-CV for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POg-00087g-Ab for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:18 +0000 Date: Sun, 13 Jul 2014 19:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: generate deep copy 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 f1f1881a195a881748567c69e980518847ce3007 Author: Wei Liu AuthorDate: Wed Jul 9 10:45:29 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl IDL: generate deep copy functions Introduces copy_fn for a type. For most builtin types we can use direct assignment. For those builtin types which cannot use direct assignment we use the copy functions in previous patch. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 67 ++++++++++++++++++++++++++++++++++ tools/libxl/idl.py | 13 ++++++- tools/libxl/idl.txt | 12 ++++++ tools/libxl/libxl_types.idl | 30 +++++++++------ tools/libxl/libxl_types_internal.idl | 2 +- 5 files changed, 110 insertions(+), 14 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 6cdeaa8..4b0c996 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -100,6 +100,61 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_type_copy(ty, v, w, indent = " ", vparent = None, wparent = None): + s = "" + + if vparent is None: + s += "GC_INIT(ctx);\n"; + + if isinstance(ty, idl.KeyedUnion): + if vparent is None or wparent is None: + raise Exception("KeyedUnion type must have a parent") + s += "%s = %s;\n" % ((vparent + ty.keyvar.name), (wparent + ty.keyvar.name)) + s += "switch (%s) {\n" % (wparent + ty.keyvar.name) + for f in ty.fields: + (vnparent,vfexpr) = ty.member(v, f, vparent is None) + (wnparent,wfexpr) = ty.member(w, f, wparent is None) + s += "case %s:\n" % f.enumname + if f.type is not None: + s += libxl_C_type_copy(f.type, vfexpr, wfexpr, indent + " ", + vnparent, wnparent) + s += " break;\n" + s += "}\n" + elif isinstance(ty, idl.Array): + if vparent is None or wparent is None: + raise Exception("Array type must have a parent") + s += "%s = libxl__calloc(NOGC, %s, sizeof(*%s));\n" % (ty.pass_arg(v, vparent is None), + (wparent + ty.lenvar.name), + ty.pass_arg(w, wparent is None)) + s += "%s = %s;\n" % ((vparent + ty.lenvar.name), (wparent + ty.lenvar.name)) + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (wparent + ty.lenvar.name) + s += libxl_C_type_copy(ty.elem_type, v+"[i]", w+"[i]", + indent + " ", vparent, wparent) + s += "}\n" + elif isinstance(ty, idl.Struct) and ((vparent is None and wparent is None) or ty.copy_fn is None): + for f in [f for f in ty.fields if not f.const and not f.type.private]: + (vnparent,vfexpr) = ty.member(v, f, vparent is None) + (wnparent,wfexpr) = ty.member(w, f, wparent is None) + s += libxl_C_type_copy(f.type, vfexpr, wfexpr, "", vnparent, wnparent) + else: + if ty.copy_fn is not None: + s += "%s(ctx, %s, %s);\n" % (ty.copy_fn, + ty.pass_arg(v, vparent is None, passby=idl.PASS_BY_REFERENCE), + ty.pass_arg(w, wparent is None, passby=idl.PASS_BY_REFERENCE)) + + else: + s += "%s = %s;\n" % (ty.pass_arg(v, vparent is None, passby=idl.PASS_BY_VALUE), + ty.pass_arg(w, wparent is None, passby=idl.PASS_BY_VALUE)) + + if vparent is None: + s += "GC_FREE;\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + def libxl_init_members(ty, nesting = 0): """Returns a list of members of ty which require a separate init""" @@ -489,6 +544,9 @@ if __name__ == '__main__': f.write(libxl_C_type_define(ty) + ";\n") if ty.dispose_fn is not None: f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.dispose_fn, ty.make_arg("p"))) + if ty.copy_fn is not None: + f.write("%svoid %s(libxl_ctx *ctx, %s, %s);\n" % (ty.hidden(), ty.copy_fn, + ty.make_arg("dst"), ty.make_arg("src"))) if ty.init_fn is not None: f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.init_fn, ty.make_arg("p"))) for field in libxl_init_members(ty): @@ -590,6 +648,15 @@ if __name__ == '__main__': f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") f.write("}\n") f.write("\n") + + for ty in [t for t in types if t.copy_fn and t.autogenerate_copy_fn]: + f.write("void %s(libxl_ctx *ctx, %s, %s)\n" % (ty.copy_fn, + ty.make_arg("dst", passby=idl.PASS_BY_REFERENCE), + ty.make_arg("src", passby=idl.PASS_BY_REFERENCE))) + f.write("{\n") + f.write(libxl_C_type_copy(ty, "dst", "src")) + f.write("}\n") + f.write("\n") for ty in [t for t in types if t.init_fn is not None and t.autogenerate_init_fn]: f.write(libxl_C_type_init(ty)) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 63557db..437049e 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -60,6 +60,13 @@ class Type(object): self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) + if self.typename is not None: + self.copy_fn = kwargs.setdefault('copy_fn', self.typename + "_copy") + else: + self.copy_fn = kwargs.setdefault('copy_fn', None) + + self.autogenerate_copy_fn = kwargs.setdefault('autogenerate_copy_fn', True) + self.init_fn = kwargs.setdefault('init_fn', None) self.init_val = kwargs.setdefault('init_val', None) self.autogenerate_init_fn = kwargs.setdefault('autogenerate_init_fn', False) @@ -128,6 +135,7 @@ class Number(Builtin): def __init__(self, ctype, **kwargs): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('copy_fn', None) kwargs.setdefault('signed', False) kwargs.setdefault('json_gen_fn', "yajl_gen_integer") kwargs.setdefault('json_parse_type', "JSON_INTEGER") @@ -141,6 +149,7 @@ class UInt(Number): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) kwargs.setdefault('json_parse_fn', "libxl__uint%d_parse_json" % w) + kwargs.setdefault('copy_fn', None) Number.__init__(self, "uint%d_t" % w, **kwargs) self.width = w @@ -157,6 +166,7 @@ class EnumerationValue(object): class Enumeration(Type): def __init__(self, typename, values, **kwargs): kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('copy_fn', None) kwargs.setdefault('json_parse_type', "JSON_STRING") Type.__init__(self, typename, **kwargs) @@ -273,6 +283,7 @@ class KeyedUnion(Aggregate): void = Builtin("void *", namespace = None) bool = Builtin("bool", namespace = None, + copy_fn=None, json_gen_fn = "yajl_gen_bool", json_parse_type = "JSON_BOOL", json_parse_fn = "libxl__bool_parse_json", @@ -287,7 +298,7 @@ uint16 = UInt(16) uint32 = UInt(32) uint64 = UInt(64, json_gen_fn = "libxl__uint64_gen_json") -string = Builtin("char *", namespace = None, dispose_fn = "free", +string = Builtin("char *", namespace = None, copy_fn = "libxl_string_copy", dispose_fn = "free", json_gen_fn = "libxl__string_gen_json", json_parse_type = "JSON_STRING | JSON_NULL", json_parse_fn = "libxl__string_parse_json", diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 87c4952..7440fb3 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -44,6 +44,18 @@ Type.autogenerate_dispose_fn: (default: True) Indicates if the above named Type.dispose_fn should be autogenerated. +Type.copy_fn: (default: typename + "_copy" or None if type == None) + + The name of the C function which will deep copy all fields within + this type. + +Type.autogenerate_copy_fn: (default: True) + + Indicates if the above named Type.copy_fn should be + autogenerated. + +Type.autogenerate_copy_fn + Type.init_val: (default: None) C expression for the value to initialise instances of this type to. diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 244075a..a412f9c 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -5,27 +5,33 @@ namespace("libxl_") -libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, +libxl_defbool = Builtin("defbool", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, copy_fn=None, check_default_fn="libxl__defbool_is_default") - libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", - json_parse_type = "JSON_INTEGER", autogenerate_json = False) + json_parse_type = "JSON_INTEGER", autogenerate_json = False, copy_fn=None) libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__int_parse_json", - json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1") -libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil") -libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default") + json_parse_type = "JSON_INTEGER", autogenerate_json = False, signed = True, init_val="-1", + copy_fn=None) +libxl_uuid = Builtin("uuid", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl_uuid_is_nil", + copy_fn="libxl_uuid_copy") +libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFERENCE, check_default_fn="libxl__mac_is_default", + copy_fn="libxl_mac_copy") libxl_bitmap = Builtin("bitmap", json_parse_type="JSON_ARRAY", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, - check_default_fn="libxl_bitmap_is_empty") + check_default_fn="libxl_bitmap_is_empty", copy_fn="libxl_bitmap_copy_alloc") libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty", + copy_fn="libxl_cpuid_policy_list_copy") libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty") + json_parse_type="JSON_ARRAY", check_default_fn="libxl__string_list_is_empty", + copy_fn="libxl_string_list_copy") libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty") + json_parse_type="JSON_MAP", check_default_fn="libxl__key_value_list_is_empty", + copy_fn="libxl_key_value_list_copy") libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE, json_parse_type="JSON_ARRAY", - check_default_fn="libxl__hwcap_is_default") -libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero") + check_default_fn="libxl__hwcap_is_default", copy_fn="libxl_hwcap_copy") +libxl_ms_vm_genid = Builtin("ms_vm_genid", passby=PASS_BY_REFERENCE, check_default_fn="libxl_ms_vm_genid_is_zero", + copy_fn="libxl_ms_vm_genid_copy") # # Specific integer types diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index 17533f1..800361b 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -3,7 +3,7 @@ hidden(True) libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer", json_parse_fn = "libxl__uint32_parse_json", json_parse_type = "JSON_INTEGER", - autogenerate_json = False) + autogenerate_json = False, copy_fn = None) libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POu-0006Q3-IX; Sun, 13 Jul 2014 19:25:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POs-0006Pr-TL for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:30 +0000 Received: from [193.109.254.147:33059] by server-13.bemta-14.messagelabs.com id 1B/60-14699-A2DD2C35; Sun, 13 Jul 2014 19:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1405279528!17211484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17742 invoked from network); 13 Jul 2014 19:25:29 -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; 13 Jul 2014 19:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POq-0003XQ-Hf for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POq-000883-G4 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:28 +0000 Date: Sun, 13 Jul 2014 19:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentest.py: test deep copy 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 ce3fd13bea454f158dbfabcc95c91c77a6bd940b Author: Wei Liu AuthorDate: Wed Jul 9 10:45:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentest.py: test deep copy functions The test is done as followed: 1. initialise libxl_FOO struct A 2. deep-copy A to B 3. generate JSON string for A and B 4. compare two JSON strings If two strings are identical then we're good. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 4f6435e..95323d1 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -273,6 +273,43 @@ int main(int argc, char **argv) f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) f.write("\n") + f.write(" printf(\"Testing TYPE_copy()\\n\");\n") + f.write(" printf(\"----------------------\\n\");\n") + f.write(" printf(\"\\n\");\n") + for ty in [t for t in types if t.copy_fn is not None]: + f.write(" printf(\"Testing %s_copy, \");\n" % ty.typename) + arg = ty.typename + "_val" + f.write(" %s_init(%s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_rand_init(%s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_copy(ctx, %s_new, %s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE), \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" s = %s_to_json(ctx, %s);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (s == NULL) abort();\n") + f.write(" new_s = %s_to_json(ctx, %s_new);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (new_s == NULL) abort();\n") + f.write(" if (strcmp(s, new_s)) {\n") + f.write(" printf(\"Huh? Deep copy for %s failed. Regenerated string different from original string.\\n\");\n" \ + % ty.typename) + f.write(" printf(\"Original string: %s\\n\", s);\n") + f.write(" printf(\"Regenerated string: %s\\n\", new_s);\n") + f.write(" abort();\n") + f.write(" }\n") + f.write(" free(s);\n") + f.write(" free(new_s);\n") + if ty.dispose_fn is not None: + f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + f.write(" printf(\"done\\n\");\n") + f.write("\n") + + f.write(" printf(\"\\n\");\n") f.write(" printf(\"Testing Enumerations\\n\");\n") f.write(" printf(\"--------------------\\n\");\n") f.write(" printf(\"\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6POu-0006Q3-IX; Sun, 13 Jul 2014 19:25:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POs-0006Pr-TL for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:30 +0000 Received: from [193.109.254.147:33059] by server-13.bemta-14.messagelabs.com id 1B/60-14699-A2DD2C35; Sun, 13 Jul 2014 19:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1405279528!17211484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17742 invoked from network); 13 Jul 2014 19:25:29 -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; 13 Jul 2014 19:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6POq-0003XQ-Hf for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6POq-000883-G4 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:28 +0000 Date: Sun, 13 Jul 2014 19:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/gentest.py: test deep copy 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 ce3fd13bea454f158dbfabcc95c91c77a6bd940b Author: Wei Liu AuthorDate: Wed Jul 9 10:45:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 13:06:55 2014 +0100 libxl/gentest.py: test deep copy functions The test is done as followed: 1. initialise libxl_FOO struct A 2. deep-copy A to B 3. generate JSON string for A and B 4. compare two JSON strings If two strings are identical then we're good. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 4f6435e..95323d1 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -273,6 +273,43 @@ int main(int argc, char **argv) f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) f.write("\n") + f.write(" printf(\"Testing TYPE_copy()\\n\");\n") + f.write(" printf(\"----------------------\\n\");\n") + f.write(" printf(\"\\n\");\n") + for ty in [t for t in types if t.copy_fn is not None]: + f.write(" printf(\"Testing %s_copy, \");\n" % ty.typename) + arg = ty.typename + "_val" + f.write(" %s_init(%s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_rand_init(%s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" %s_copy(ctx, %s_new, %s);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE), \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + f.write(" s = %s_to_json(ctx, %s);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (s == NULL) abort();\n") + f.write(" new_s = %s_to_json(ctx, %s_new);\n" % \ + (ty.typename, ty.pass_arg(arg, isref=False))) + f.write(" if (new_s == NULL) abort();\n") + f.write(" if (strcmp(s, new_s)) {\n") + f.write(" printf(\"Huh? Deep copy for %s failed. Regenerated string different from original string.\\n\");\n" \ + % ty.typename) + f.write(" printf(\"Original string: %s\\n\", s);\n") + f.write(" printf(\"Regenerated string: %s\\n\", new_s);\n") + f.write(" abort();\n") + f.write(" }\n") + f.write(" free(s);\n") + f.write(" free(new_s);\n") + if ty.dispose_fn is not None: + f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + f.write(" printf(\"done\\n\");\n") + f.write("\n") + + f.write(" printf(\"\\n\");\n") f.write(" printf(\"Testing Enumerations\\n\");\n") f.write(" printf(\"--------------------\\n\");\n") f.write(" printf(\"\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:25:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6PP4-0006RT-S5; Sun, 13 Jul 2014 19:25:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PP3-0006RE-5G for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:41 +0000 Received: from [85.158.139.211:60928] by server-2.bemta-5.messagelabs.com id B9/CE-01647-43DD2C35; Sun, 13 Jul 2014 19:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279538!15321636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17579 invoked from network); 13 Jul 2014 19:25:39 -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; 13 Jul 2014 19:25:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PP0-0003XW-Mw for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PP0-00088X-Le for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:38 +0000 Date: Sun, 13 Jul 2014 19:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move and rename is_vcpu_running function to sched.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 28432b536c5161b09c4171647e1a15c5b3518ed3 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:16 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:42:53 2014 +0100 xen/arm: move and rename is_vcpu_running function to sched.h is_vcpu_running function in vgic driver is generic. So move this to sched.h and rename it as is_vcpu_online Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell CC: jbeulich@suse.com CC: keir@xen.org CC: george.dunlap@citrix.com --- xen/arch/arm/vgic.c | 21 +++------------------ xen/include/xen/sched.h | 5 +++++ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 96bd7c1..da807bd 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -405,22 +405,6 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } } -static inline int is_vcpu_running(struct domain *d, int vcpuid) -{ - struct vcpu *v; - - if ( vcpuid >= d->max_vcpus ) - return 0; - - v = d->vcpu[vcpuid]; - if ( v == NULL ) - return 0; - if (test_bit(_VPF_down, &v->pause_flags) ) - return 0; - - return 1; -} - static int vgic_to_sgi(struct vcpu *v, register_t sgir) { struct domain *d = v->domain; @@ -444,7 +428,8 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) case GICD_SGI_TARGET_OTHERS: for ( i = 0; i < d->max_vcpus; i++ ) { - if ( i != current->vcpu_id && is_vcpu_running(d, i) ) + if ( i != current->vcpu_id && d->vcpu[i] != NULL && + is_vcpu_online(d->vcpu[i]) ) set_bit(i, &vcpu_mask); } break; @@ -459,7 +444,7 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) for_each_set_bit( vcpuid, &vcpu_mask, d->max_vcpus ) { - if ( !is_vcpu_running(d, vcpuid) ) + if ( d->vcpu[vcpuid] != NULL && !is_vcpu_online(d->vcpu[vcpuid]) ) { gdprintk(XENLOG_WARNING, "vGICD: GICD_SGIR write r=%"PRIregister" vcpu_mask=%lx, wrong CPUTargetList\n", sgir, vcpu_mask); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d5bc461..2f876f5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -838,6 +838,11 @@ void watchdog_domain_destroy(struct domain *d); #define need_iommu(d) (0) #endif +static inline bool_t is_vcpu_online(const struct vcpu *v) +{ + return !test_bit(_VPF_down, &v->pause_flags); +} + void set_vcpu_migration_delay(unsigned int delay); unsigned int get_vcpu_migration_delay(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 Sun Jul 13 19:25:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6PP4-0006RT-S5; Sun, 13 Jul 2014 19:25:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PP3-0006RE-5G for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:41 +0000 Received: from [85.158.139.211:60928] by server-2.bemta-5.messagelabs.com id B9/CE-01647-43DD2C35; Sun, 13 Jul 2014 19:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279538!15321636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17579 invoked from network); 13 Jul 2014 19:25:39 -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; 13 Jul 2014 19:25:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PP0-0003XW-Mw for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PP0-00088X-Le for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:38 +0000 Date: Sun, 13 Jul 2014 19:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move and rename is_vcpu_running function to sched.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 28432b536c5161b09c4171647e1a15c5b3518ed3 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:16 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:42:53 2014 +0100 xen/arm: move and rename is_vcpu_running function to sched.h is_vcpu_running function in vgic driver is generic. So move this to sched.h and rename it as is_vcpu_online Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell CC: jbeulich@suse.com CC: keir@xen.org CC: george.dunlap@citrix.com --- xen/arch/arm/vgic.c | 21 +++------------------ xen/include/xen/sched.h | 5 +++++ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 96bd7c1..da807bd 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -405,22 +405,6 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } } -static inline int is_vcpu_running(struct domain *d, int vcpuid) -{ - struct vcpu *v; - - if ( vcpuid >= d->max_vcpus ) - return 0; - - v = d->vcpu[vcpuid]; - if ( v == NULL ) - return 0; - if (test_bit(_VPF_down, &v->pause_flags) ) - return 0; - - return 1; -} - static int vgic_to_sgi(struct vcpu *v, register_t sgir) { struct domain *d = v->domain; @@ -444,7 +428,8 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) case GICD_SGI_TARGET_OTHERS: for ( i = 0; i < d->max_vcpus; i++ ) { - if ( i != current->vcpu_id && is_vcpu_running(d, i) ) + if ( i != current->vcpu_id && d->vcpu[i] != NULL && + is_vcpu_online(d->vcpu[i]) ) set_bit(i, &vcpu_mask); } break; @@ -459,7 +444,7 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) for_each_set_bit( vcpuid, &vcpu_mask, d->max_vcpus ) { - if ( !is_vcpu_running(d, vcpuid) ) + if ( d->vcpu[vcpuid] != NULL && !is_vcpu_online(d->vcpu[vcpuid]) ) { gdprintk(XENLOG_WARNING, "vGICD: GICD_SGIR write r=%"PRIregister" vcpu_mask=%lx, wrong CPUTargetList\n", sgir, vcpu_mask); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d5bc461..2f876f5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -838,6 +838,11 @@ void watchdog_domain_destroy(struct domain *d); #define need_iommu(d) (0) #endif +static inline bool_t is_vcpu_online(const struct vcpu *v) +{ + return !test_bit(_VPF_down, &v->pause_flags); +} + void set_vcpu_migration_delay(unsigned int delay); unsigned int get_vcpu_migration_delay(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 Sun Jul 13 19:25:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6PPE-0006T5-Uk; Sun, 13 Jul 2014 19:25:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPE-0006Ss-3Q for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:52 +0000 Received: from [85.158.137.68:47466] by server-5.bemta-3.messagelabs.com id 7E/B6-15381-F3DD2C35; Sun, 13 Jul 2014 19:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1405279549!15596685!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29496 invoked from network); 13 Jul 2014 19:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Jul 2014 19:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPA-0003Xc-RX for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPA-00088t-QS for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:48 +0000 Date: Sun, 13 Jul 2014 19:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move pending_irq structure to vgic header 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 2673d904822ba2c765ca648f0bc89a3f112394b7 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:17 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: move pending_irq structure to vgic header file gic.h requires definition of pending_irq structure defined in domain.h and domain.h requires gic_state structure defined in gic.h and hence there is inter-dependency between domain.h and gic.h files. So move pending_irq to vgic.h which is relevant place for this structure and break domain.h and gic.h interdependency By this move irq_to_pending function declaration from gic.h to vgic.h Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/domain.h | 57 ----------------------------------------- xen/include/asm-arm/gic.h | 2 +- xen/include/asm-arm/vgic.h | 58 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 58 deletions(-) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 077ac1e..2a1e976 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -13,63 +13,6 @@ #include #include -struct pending_irq -{ - /* - * The following two states track the lifecycle of the guest irq. - * However because we are not sure and we don't want to track - * whether an irq added to an LR register is PENDING or ACTIVE, the - * following states are just an approximation. - * - * GIC_IRQ_GUEST_QUEUED: the irq is asserted and queued for - * injection into the guest's LRs. - * - * GIC_IRQ_GUEST_VISIBLE: the irq has been added to an LR register, - * therefore the guest is aware of it. From the guest point of view - * the irq can be pending (if the guest has not acked the irq yet) - * or active (after acking the irq). - * - * In order for the state machine to be fully accurate, for level - * interrupts, we should keep the interrupt's pending state until - * the guest deactivates the irq. However because we are not sure - * when that happens, we instead track whether there is an interrupt - * queued using GIC_IRQ_GUEST_QUEUED. We clear it when we add it to - * an LR register. We set it when we receive another interrupt - * notification. Therefore it is possible to set - * GIC_IRQ_GUEST_QUEUED while the irq is GIC_IRQ_GUEST_VISIBLE. We - * could also change the state of the guest irq in the LR register - * from active to active and pending, but for simplicity we simply - * inject a second irq after the guest EOIs the first one. - * - * - * An additional state is used to keep track of whether the guest - * irq is enabled at the vgicd level: - * - * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD - * level (GICD_ICENABLER/GICD_ISENABLER). - * - */ -#define GIC_IRQ_GUEST_QUEUED 0 -#define GIC_IRQ_GUEST_ACTIVE 1 -#define GIC_IRQ_GUEST_VISIBLE 2 -#define GIC_IRQ_GUEST_ENABLED 3 - unsigned long status; - struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ - int irq; -#define GIC_INVALID_LR ~(uint8_t)0 - uint8_t lr; - uint8_t priority; - /* inflight is used to append instances of pending_irq to - * vgic.inflight_irqs */ - struct list_head inflight; - /* lr_queue is used to append instances of pending_irq to - * lr_pending. lr_pending is a per vcpu queue, therefore lr_queue - * accesses are protected with the vgic lock. - * TODO: when implementing irq migration, taking only the current - * vgic lock is not going to be enough. */ - struct list_head lr_queue; -}; - struct hvm_domain { uint64_t params[HVM_NR_PARAMS]; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index ed610cb..875729e 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -143,6 +143,7 @@ #ifndef __ASSEMBLY__ #include #include +#include #define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" #define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" @@ -188,7 +189,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt */ extern void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 92f1e86..003c3e9 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -20,6 +20,63 @@ #include +struct pending_irq +{ + /* + * The following two states track the lifecycle of the guest irq. + * However because we are not sure and we don't want to track + * whether an irq added to an LR register is PENDING or ACTIVE, the + * following states are just an approximation. + * + * GIC_IRQ_GUEST_QUEUED: the irq is asserted and queued for + * injection into the guest's LRs. + * + * GIC_IRQ_GUEST_VISIBLE: the irq has been added to an LR register, + * therefore the guest is aware of it. From the guest point of view + * the irq can be pending (if the guest has not acked the irq yet) + * or active (after acking the irq). + * + * In order for the state machine to be fully accurate, for level + * interrupts, we should keep the interrupt's pending state until + * the guest deactivates the irq. However because we are not sure + * when that happens, we instead track whether there is an interrupt + * queued using GIC_IRQ_GUEST_QUEUED. We clear it when we add it to + * an LR register. We set it when we receive another interrupt + * notification. Therefore it is possible to set + * GIC_IRQ_GUEST_QUEUED while the irq is GIC_IRQ_GUEST_VISIBLE. We + * could also change the state of the guest irq in the LR register + * from active to active and pending, but for simplicity we simply + * inject a second irq after the guest EOIs the first one. + * + * + * An additional state is used to keep track of whether the guest + * irq is enabled at the vgicd level: + * + * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD + * level (GICD_ICENABLER/GICD_ISENABLER). + * + */ +#define GIC_IRQ_GUEST_QUEUED 0 +#define GIC_IRQ_GUEST_ACTIVE 1 +#define GIC_IRQ_GUEST_VISIBLE 2 +#define GIC_IRQ_GUEST_ENABLED 3 + unsigned long status; + struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ + int irq; +#define GIC_INVALID_LR ~(uint8_t)0 + uint8_t lr; + uint8_t priority; + /* inflight is used to append instances of pending_irq to + * vgic.inflight_irqs */ + struct list_head inflight; + /* lr_queue is used to append instances of pending_irq to + * lr_pending. lr_pending is a per vcpu queue, therefore lr_queue + * accesses are protected with the vgic lock. + * TODO: when implementing irq migration, taking only the current + * vgic lock is not going to be enough. */ + struct list_head lr_queue; +}; + /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ @@ -87,6 +144,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); +extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern int vcpu_vgic_free(struct vcpu *v); #endif /* __ASM_ARM_VGIC_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 Sun Jul 13 19:25:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:25: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 1X6PPE-0006T5-Uk; Sun, 13 Jul 2014 19:25:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPE-0006Ss-3Q for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:52 +0000 Received: from [85.158.137.68:47466] by server-5.bemta-3.messagelabs.com id 7E/B6-15381-F3DD2C35; Sun, 13 Jul 2014 19:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1405279549!15596685!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29496 invoked from network); 13 Jul 2014 19:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Jul 2014 19:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPA-0003Xc-RX for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPA-00088t-QS for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:48 +0000 Date: Sun, 13 Jul 2014 19:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move pending_irq structure to vgic header 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 2673d904822ba2c765ca648f0bc89a3f112394b7 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:17 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: move pending_irq structure to vgic header file gic.h requires definition of pending_irq structure defined in domain.h and domain.h requires gic_state structure defined in gic.h and hence there is inter-dependency between domain.h and gic.h files. So move pending_irq to vgic.h which is relevant place for this structure and break domain.h and gic.h interdependency By this move irq_to_pending function declaration from gic.h to vgic.h Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/domain.h | 57 ----------------------------------------- xen/include/asm-arm/gic.h | 2 +- xen/include/asm-arm/vgic.h | 58 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 58 deletions(-) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 077ac1e..2a1e976 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -13,63 +13,6 @@ #include #include -struct pending_irq -{ - /* - * The following two states track the lifecycle of the guest irq. - * However because we are not sure and we don't want to track - * whether an irq added to an LR register is PENDING or ACTIVE, the - * following states are just an approximation. - * - * GIC_IRQ_GUEST_QUEUED: the irq is asserted and queued for - * injection into the guest's LRs. - * - * GIC_IRQ_GUEST_VISIBLE: the irq has been added to an LR register, - * therefore the guest is aware of it. From the guest point of view - * the irq can be pending (if the guest has not acked the irq yet) - * or active (after acking the irq). - * - * In order for the state machine to be fully accurate, for level - * interrupts, we should keep the interrupt's pending state until - * the guest deactivates the irq. However because we are not sure - * when that happens, we instead track whether there is an interrupt - * queued using GIC_IRQ_GUEST_QUEUED. We clear it when we add it to - * an LR register. We set it when we receive another interrupt - * notification. Therefore it is possible to set - * GIC_IRQ_GUEST_QUEUED while the irq is GIC_IRQ_GUEST_VISIBLE. We - * could also change the state of the guest irq in the LR register - * from active to active and pending, but for simplicity we simply - * inject a second irq after the guest EOIs the first one. - * - * - * An additional state is used to keep track of whether the guest - * irq is enabled at the vgicd level: - * - * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD - * level (GICD_ICENABLER/GICD_ISENABLER). - * - */ -#define GIC_IRQ_GUEST_QUEUED 0 -#define GIC_IRQ_GUEST_ACTIVE 1 -#define GIC_IRQ_GUEST_VISIBLE 2 -#define GIC_IRQ_GUEST_ENABLED 3 - unsigned long status; - struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ - int irq; -#define GIC_INVALID_LR ~(uint8_t)0 - uint8_t lr; - uint8_t priority; - /* inflight is used to append instances of pending_irq to - * vgic.inflight_irqs */ - struct list_head inflight; - /* lr_queue is used to append instances of pending_irq to - * lr_pending. lr_pending is a per vcpu queue, therefore lr_queue - * accesses are protected with the vgic lock. - * TODO: when implementing irq migration, taking only the current - * vgic lock is not going to be enough. */ - struct list_head lr_queue; -}; - struct hvm_domain { uint64_t params[HVM_NR_PARAMS]; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index ed610cb..875729e 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -143,6 +143,7 @@ #ifndef __ASSEMBLY__ #include #include +#include #define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" #define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" @@ -188,7 +189,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt */ extern void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 92f1e86..003c3e9 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -20,6 +20,63 @@ #include +struct pending_irq +{ + /* + * The following two states track the lifecycle of the guest irq. + * However because we are not sure and we don't want to track + * whether an irq added to an LR register is PENDING or ACTIVE, the + * following states are just an approximation. + * + * GIC_IRQ_GUEST_QUEUED: the irq is asserted and queued for + * injection into the guest's LRs. + * + * GIC_IRQ_GUEST_VISIBLE: the irq has been added to an LR register, + * therefore the guest is aware of it. From the guest point of view + * the irq can be pending (if the guest has not acked the irq yet) + * or active (after acking the irq). + * + * In order for the state machine to be fully accurate, for level + * interrupts, we should keep the interrupt's pending state until + * the guest deactivates the irq. However because we are not sure + * when that happens, we instead track whether there is an interrupt + * queued using GIC_IRQ_GUEST_QUEUED. We clear it when we add it to + * an LR register. We set it when we receive another interrupt + * notification. Therefore it is possible to set + * GIC_IRQ_GUEST_QUEUED while the irq is GIC_IRQ_GUEST_VISIBLE. We + * could also change the state of the guest irq in the LR register + * from active to active and pending, but for simplicity we simply + * inject a second irq after the guest EOIs the first one. + * + * + * An additional state is used to keep track of whether the guest + * irq is enabled at the vgicd level: + * + * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD + * level (GICD_ICENABLER/GICD_ISENABLER). + * + */ +#define GIC_IRQ_GUEST_QUEUED 0 +#define GIC_IRQ_GUEST_ACTIVE 1 +#define GIC_IRQ_GUEST_VISIBLE 2 +#define GIC_IRQ_GUEST_ENABLED 3 + unsigned long status; + struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ + int irq; +#define GIC_INVALID_LR ~(uint8_t)0 + uint8_t lr; + uint8_t priority; + /* inflight is used to append instances of pending_irq to + * vgic.inflight_irqs */ + struct list_head inflight; + /* lr_queue is used to append instances of pending_irq to + * lr_pending. lr_pending is a per vcpu queue, therefore lr_queue + * accesses are protected with the vgic lock. + * TODO: when implementing irq migration, taking only the current + * vgic lock is not going to be enough. */ + struct list_head lr_queue; +}; + /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ @@ -87,6 +144,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); +extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern int vcpu_vgic_free(struct vcpu *v); #endif /* __ASM_ARM_VGIC_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 Sun Jul 13 19:26:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPQ-0006UW-1L; Sun, 13 Jul 2014 19:26:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPO-0006UF-I5 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:02 +0000 Received: from [85.158.143.35:62239] by server-1.bemta-4.messagelabs.com id 72/71-30046-94DD2C35; Sun, 13 Jul 2014 19:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1405279559!17487032!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18783 invoked from network); 13 Jul 2014 19:26:00 -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; 13 Jul 2014 19:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPL-0003Xl-0k for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPK-00089y-Vj for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:58 +0000 Date: Sun, 13 Jul 2014 19:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: calculate vgic irq rank based on register 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 44add14c2e134d00b2eabfa4a306a4a24e3b0a7a Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:18 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: calculate vgic irq rank based on register size vGIC irq rank was computed assuming the register offset is byte size.Use the HSR abort address size in calculating register size. So, with this patch following are achieved (1) In the code 'dabt.size != number' this number is always BYTE/HALF_WORD/WORD/DOUBLE defined by HSR register. Instead of checking for hard coded values use HSR abort address size values. (2) The vgic_rank_offset also depends on register size to compute the rank offset. Though there is no direct relation between rank offset computation and HSR dabt.size the same values are used to calculate irq rank. This make vgic_rank_offset generic as it takes register size as parameter to calculate irq rank instead of hard coding to value 2 in previous patches Also, output of REG_RANK_INDEX macro is modulo by 32 to make sure register index is always within irq rank Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 139 ++++++++++++++++++++------------------ xen/include/asm-arm/processor.h | 8 ++ xen/include/asm-arm/vgic.h | 4 +- 3 files changed, 83 insertions(+), 68 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index da807bd..48551bf 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -40,9 +40,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ -static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) +static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, + int s) { - int rank = REG_RANK_NR(b, (n >> 2)); + int rank = REG_RANK_NR(b, (n >> s)); if ( rank == 0 ) return v->arch.vgic.private_irqs; @@ -54,7 +55,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq); + return vgic_rank_offset(v, 8, irq, DABT_WORD); } static const struct mmio_handler_ops vgic_distr_mmio_handler = { @@ -161,13 +162,13 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) switch ( gicd_reg ) { case GICD_CTLR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; vgic_lock(v); *r = v->domain->arch.vgic.ctlr; vgic_unlock(v); return 1; case GICD_TYPER: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ vgic_lock(v); *r = ( (v->domain->max_vcpus<<5) & GICD_TYPE_CPUS ) @@ -175,7 +176,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock(v); return 1; case GICD_IIDR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* * XXX Do we need a JEP106 manufacturer ID? * Just use the physical h/w value for now @@ -192,8 +193,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -201,8 +202,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -210,8 +211,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->ipend, dabt.sign, offset); @@ -219,8 +220,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->ipend, dabt.sign, offset); @@ -228,8 +229,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -237,8 +238,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -246,35 +247,37 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ITARGETSR ... GICD_ITARGETSRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)]; - if ( dabt.size == 0 ) + *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR); + if ( dabt.size != 0 && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)]; - if ( dabt.size == 0 ) + *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; case GICD_ICFGR ... GICD_ICFGRN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR)]; + *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; vgic_unlock_rank(v, rank); return 1; @@ -283,14 +286,14 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_SGIR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* Write only -- read unknown */ *r = 0xdeadbeef; return 1; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); @@ -298,8 +301,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); @@ -311,7 +314,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_ICPIDR2: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled read from ICPIDR2\n"); return 0; @@ -341,7 +344,7 @@ bad_width: return 0; read_as_zero: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; } @@ -468,7 +471,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) switch ( gicd_reg ) { case GICD_CTLR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* Ignore all but the enable bit */ v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; return 1; @@ -487,42 +490,44 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> 2); + vgic_enable_irqs(v, (*r) & (~tr), + (gicd_reg - GICD_ISENABLER) >> DABT_WORD); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable &= ~*r; vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> 2); + vgic_disable_irqs(v, (*r) & tr, + (gicd_reg - GICD_ICENABLER) >> DABT_WORD); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); return 0; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); return 0; case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -530,8 +535,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -543,30 +548,32 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - if ( dabt.size == 2 ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = *r; + if ( dabt.size == DABT_WORD ) + rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = *r; else { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR); + tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); vgic_byte_write(&rank->itargets[tr], *r, offset); } vgic_unlock_rank(v, rank); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - if ( dabt.size == 2 ) - rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)] = *r; + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; else { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR); + tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); vgic_byte_write(&rank->ipriority[tr], *r, offset); } vgic_unlock_rank(v, rank); @@ -578,11 +585,11 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* It is implementation defined if these are writeable. We chose not */ goto write_ignore; case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR)] = *r; + rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; vgic_unlock_rank(v, rank); return 1; @@ -596,13 +603,13 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return vgic_to_sgi(v, *r); case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); return 0; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); return 0; @@ -641,7 +648,7 @@ bad_width: return 0; write_ignore: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } @@ -693,7 +700,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 3be86f1..bdfff4e 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -251,6 +251,14 @@ extern struct cpuinfo_arm cpu_data[]; extern u32 __cpu_logical_map[]; #define cpu_logical_map(cpu) __cpu_logical_map[cpu] +/* HSR data abort size definition */ +enum dabt_size { + DABT_BYTE = 0, + DABT_HALF_WORD = 1, + DABT_WORD = 2, + DABT_DOUBLE_WORD = 3, +}; + union hsr { uint32_t bits; struct { diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 003c3e9..7c71d16 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -134,10 +134,10 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) } /* - * Offset of GICD_ with its rank, for GICD_ with + * Offset of GICD_ with its rank, for GICD_ size with * -bits-per-interrupt. */ -#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) +#define REG_RANK_INDEX(b, n, s) ((((n) >> s) & ((b)-1)) % 32) extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(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 Sun Jul 13 19:26:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPQ-0006UW-1L; Sun, 13 Jul 2014 19:26:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPO-0006UF-I5 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:02 +0000 Received: from [85.158.143.35:62239] by server-1.bemta-4.messagelabs.com id 72/71-30046-94DD2C35; Sun, 13 Jul 2014 19:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1405279559!17487032!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18783 invoked from network); 13 Jul 2014 19:26:00 -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; 13 Jul 2014 19:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPL-0003Xl-0k for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPK-00089y-Vj for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:25:58 +0000 Date: Sun, 13 Jul 2014 19:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: calculate vgic irq rank based on register 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 44add14c2e134d00b2eabfa4a306a4a24e3b0a7a Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:18 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: calculate vgic irq rank based on register size vGIC irq rank was computed assuming the register offset is byte size.Use the HSR abort address size in calculating register size. So, with this patch following are achieved (1) In the code 'dabt.size != number' this number is always BYTE/HALF_WORD/WORD/DOUBLE defined by HSR register. Instead of checking for hard coded values use HSR abort address size values. (2) The vgic_rank_offset also depends on register size to compute the rank offset. Though there is no direct relation between rank offset computation and HSR dabt.size the same values are used to calculate irq rank. This make vgic_rank_offset generic as it takes register size as parameter to calculate irq rank instead of hard coding to value 2 in previous patches Also, output of REG_RANK_INDEX macro is modulo by 32 to make sure register index is always within irq rank Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 139 ++++++++++++++++++++------------------ xen/include/asm-arm/processor.h | 8 ++ xen/include/asm-arm/vgic.h | 4 +- 3 files changed, 83 insertions(+), 68 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index da807bd..48551bf 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -40,9 +40,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ -static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) +static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, + int s) { - int rank = REG_RANK_NR(b, (n >> 2)); + int rank = REG_RANK_NR(b, (n >> s)); if ( rank == 0 ) return v->arch.vgic.private_irqs; @@ -54,7 +55,7 @@ static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n) static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq); + return vgic_rank_offset(v, 8, irq, DABT_WORD); } static const struct mmio_handler_ops vgic_distr_mmio_handler = { @@ -161,13 +162,13 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) switch ( gicd_reg ) { case GICD_CTLR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; vgic_lock(v); *r = v->domain->arch.vgic.ctlr; vgic_unlock(v); return 1; case GICD_TYPER: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ vgic_lock(v); *r = ( (v->domain->max_vcpus<<5) & GICD_TYPE_CPUS ) @@ -175,7 +176,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock(v); return 1; case GICD_IIDR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* * XXX Do we need a JEP106 manufacturer ID? * Just use the physical h/w value for now @@ -192,8 +193,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -201,8 +202,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -210,8 +211,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->ipend, dabt.sign, offset); @@ -219,8 +220,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->ipend, dabt.sign, offset); @@ -228,8 +229,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -237,8 +238,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -246,35 +247,37 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ITARGETSR ... GICD_ITARGETSRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)]; - if ( dabt.size == 0 ) + *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR); + if ( dabt.size != 0 && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)]; - if ( dabt.size == 0 ) + *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; case GICD_ICFGR ... GICD_ICFGRN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR)]; + *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; vgic_unlock_rank(v, rank); return 1; @@ -283,14 +286,14 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_SGIR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* Write only -- read unknown */ *r = 0xdeadbeef; return 1; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); @@ -298,8 +301,8 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); @@ -311,7 +314,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) goto read_as_zero; case GICD_ICPIDR2: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled read from ICPIDR2\n"); return 0; @@ -341,7 +344,7 @@ bad_width: return 0; read_as_zero: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; } @@ -468,7 +471,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) switch ( gicd_reg ) { case GICD_CTLR: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; /* Ignore all but the enable bit */ v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; return 1; @@ -487,42 +490,44 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> 2); + vgic_enable_irqs(v, (*r) & (~tr), + (gicd_reg - GICD_ISENABLER) >> DABT_WORD); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable &= ~*r; vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> 2); + vgic_disable_irqs(v, (*r) & tr, + (gicd_reg - GICD_ICENABLER) >> DABT_WORD); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); return 0; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); return 0; case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -530,8 +535,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -543,30 +548,32 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - if ( dabt.size == 2 ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = *r; + if ( dabt.size == DABT_WORD ) + rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = *r; else { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR); + tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); vgic_byte_write(&rank->itargets[tr], *r, offset); } vgic_unlock_rank(v, rank); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR); + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - if ( dabt.size == 2 ) - rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)] = *r; + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; else { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR); + tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); vgic_byte_write(&rank->ipriority[tr], *r, offset); } vgic_unlock_rank(v, rank); @@ -578,11 +585,11 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* It is implementation defined if these are writeable. We chose not */ goto write_ignore; case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ - if ( dabt.size != 2 ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); - rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR)] = *r; + rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; vgic_unlock_rank(v, rank); return 1; @@ -596,13 +603,13 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return vgic_to_sgi(v, *r); case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); return 0; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); return 0; @@ -641,7 +648,7 @@ bad_width: return 0; write_ignore: - if ( dabt.size != 2 ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } @@ -693,7 +700,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 3be86f1..bdfff4e 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -251,6 +251,14 @@ extern struct cpuinfo_arm cpu_data[]; extern u32 __cpu_logical_map[]; #define cpu_logical_map(cpu) __cpu_logical_map[cpu] +/* HSR data abort size definition */ +enum dabt_size { + DABT_BYTE = 0, + DABT_HALF_WORD = 1, + DABT_WORD = 2, + DABT_DOUBLE_WORD = 3, +}; + union hsr { uint32_t bits; struct { diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 003c3e9..7c71d16 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -134,10 +134,10 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) } /* - * Offset of GICD_ with its rank, for GICD_ with + * Offset of GICD_ with its rank, for GICD_ size with * -bits-per-interrupt. */ -#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) +#define REG_RANK_INDEX(b, n, s) ((((n) >> s) & ((b)-1)) % 32) extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(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 Sun Jul 13 19:26:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPZ-0006Vq-68; Sun, 13 Jul 2014 19:26:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPY-0006Vf-0T for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:12 +0000 Received: from [85.158.139.211:24210] by server-13.bemta-5.messagelabs.com id A5/C7-02995-35DD2C35; Sun, 13 Jul 2014 19:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279569!15321670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19502 invoked from network); 13 Jul 2014 19:26:10 -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; 13 Jul 2014 19:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPV-0003YK-63 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPV-0008AW-4s for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:09 +0000 Date: Sun, 13 Jul 2014 19:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove REG macro in vgic driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5074c82bda634f9a757f44339124736f5346453 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:19 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: Remove REG macro in vgic driver REG macro does not compute any value and offset variable is no more required. Hence removed Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 68 ++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 48551bf..c8fbf9b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,8 +31,6 @@ #include #include -#define REG(n) (n) - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); @@ -156,8 +154,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; - int offset = (int)(info->gpa - v->domain->arch.vgic.dbase); - int gicd_reg = REG(offset); + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); switch ( gicd_reg ) { @@ -185,7 +182,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; /* Implementation defined -- read as zero */ - case REG(0x020) ... REG(0x03c): + case 0x020 ... 0x03c: goto read_as_zero; case GICD_IGROUPR ... GICD_IGROUPRN: @@ -215,7 +212,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -224,7 +221,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -255,7 +252,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -268,7 +265,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -296,7 +293,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -305,12 +302,12 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; /* Implementation defined -- read as zero */ - case REG(0xfd0) ... REG(0xfe4): + case 0xfd0 ... 0xfe4: goto read_as_zero; case GICD_ICPIDR2: @@ -319,27 +316,27 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 0; /* Implementation defined -- read as zero */ - case REG(0xfec) ... REG(0xffc): + case 0xfec ... 0xffc: goto read_as_zero; /* Reserved -- read as zero */ - case REG(0x00c) ... REG(0x01c): - case REG(0x040) ... REG(0x07c): - case REG(0x7fc): - case REG(0xbfc): - case REG(0xf04) ... REG(0xf0c): - case REG(0xf30) ... REG(0xfcc): + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: goto read_as_zero; default: printk("vGICD: unhandled read r%d offset %#08x\n", - dabt.reg, offset); + dabt.reg, gicd_reg); return 0; } bad_width: printk("vGICD: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, offset); + dabt.size, dabt.reg, gicd_reg); domain_crash_synchronous(); return 0; @@ -464,8 +461,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; - int offset = (int)(info->gpa - v->domain->arch.vgic.dbase); - int gicd_reg = REG(offset); + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); uint32_t tr; switch ( gicd_reg ) @@ -482,7 +478,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; /* Implementation defined -- write ignored */ - case REG(0x020) ... REG(0x03c): + case 0x020 ... 0x03c: goto write_ignore; case GICD_IGROUPR ... GICD_IGROUPRN: @@ -558,7 +554,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else { tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - vgic_byte_write(&rank->itargets[tr], *r, offset); + vgic_byte_write(&rank->itargets[tr], *r, gicd_reg); } vgic_unlock_rank(v, rank); return 1; @@ -574,7 +570,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else { tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - vgic_byte_write(&rank->ipriority[tr], *r, offset); + vgic_byte_write(&rank->ipriority[tr], *r, gicd_reg); } vgic_unlock_rank(v, rank); return 1; @@ -615,7 +611,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 0; /* Implementation defined -- write ignored */ - case REG(0xfd0) ... REG(0xfe4): + case 0xfd0 ... 0xfe4: goto write_ignore; /* R/O -- write ignore */ @@ -623,27 +619,27 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; /* Implementation defined -- write ignored */ - case REG(0xfec) ... REG(0xffc): + case 0xfec ... 0xffc: goto write_ignore; /* Reserved -- write ignored */ - case REG(0x00c) ... REG(0x01c): - case REG(0x040) ... REG(0x07c): - case REG(0x7fc): - case REG(0xbfc): - case REG(0xf04) ... REG(0xf0c): - case REG(0xf30) ... REG(0xfcc): + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: goto write_ignore; default: printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", - dabt.reg, *r, offset); + dabt.reg, *r, gicd_reg); return 0; } bad_width: printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", - dabt.size, dabt.reg, *r, offset); + dabt.size, dabt.reg, *r, gicd_reg); domain_crash_synchronous(); 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 Sun Jul 13 19:26:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPZ-0006Vq-68; Sun, 13 Jul 2014 19:26:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPY-0006Vf-0T for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:12 +0000 Received: from [85.158.139.211:24210] by server-13.bemta-5.messagelabs.com id A5/C7-02995-35DD2C35; Sun, 13 Jul 2014 19:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1405279569!15321670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19502 invoked from network); 13 Jul 2014 19:26:10 -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; 13 Jul 2014 19:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPV-0003YK-63 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPV-0008AW-4s for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:09 +0000 Date: Sun, 13 Jul 2014 19:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove REG macro in vgic driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5074c82bda634f9a757f44339124736f5346453 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:19 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:10 2014 +0100 xen/arm: Remove REG macro in vgic driver REG macro does not compute any value and offset variable is no more required. Hence removed Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 68 ++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 48551bf..c8fbf9b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,8 +31,6 @@ #include #include -#define REG(n) (n) - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); @@ -156,8 +154,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; - int offset = (int)(info->gpa - v->domain->arch.vgic.dbase); - int gicd_reg = REG(offset); + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); switch ( gicd_reg ) { @@ -185,7 +182,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; /* Implementation defined -- read as zero */ - case REG(0x020) ... REG(0x03c): + case 0x020 ... 0x03c: goto read_as_zero; case GICD_IGROUPR ... GICD_IGROUPRN: @@ -215,7 +212,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -224,7 +221,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -255,7 +252,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -268,7 +265,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -296,7 +293,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -305,12 +302,12 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank); return 1; /* Implementation defined -- read as zero */ - case REG(0xfd0) ... REG(0xfe4): + case 0xfd0 ... 0xfe4: goto read_as_zero; case GICD_ICPIDR2: @@ -319,27 +316,27 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 0; /* Implementation defined -- read as zero */ - case REG(0xfec) ... REG(0xffc): + case 0xfec ... 0xffc: goto read_as_zero; /* Reserved -- read as zero */ - case REG(0x00c) ... REG(0x01c): - case REG(0x040) ... REG(0x07c): - case REG(0x7fc): - case REG(0xbfc): - case REG(0xf04) ... REG(0xf0c): - case REG(0xf30) ... REG(0xfcc): + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: goto read_as_zero; default: printk("vGICD: unhandled read r%d offset %#08x\n", - dabt.reg, offset); + dabt.reg, gicd_reg); return 0; } bad_width: printk("vGICD: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, offset); + dabt.size, dabt.reg, gicd_reg); domain_crash_synchronous(); return 0; @@ -464,8 +461,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; - int offset = (int)(info->gpa - v->domain->arch.vgic.dbase); - int gicd_reg = REG(offset); + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); uint32_t tr; switch ( gicd_reg ) @@ -482,7 +478,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; /* Implementation defined -- write ignored */ - case REG(0x020) ... REG(0x03c): + case 0x020 ... 0x03c: goto write_ignore; case GICD_IGROUPR ... GICD_IGROUPRN: @@ -558,7 +554,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else { tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - vgic_byte_write(&rank->itargets[tr], *r, offset); + vgic_byte_write(&rank->itargets[tr], *r, gicd_reg); } vgic_unlock_rank(v, rank); return 1; @@ -574,7 +570,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else { tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - vgic_byte_write(&rank->ipriority[tr], *r, offset); + vgic_byte_write(&rank->ipriority[tr], *r, gicd_reg); } vgic_unlock_rank(v, rank); return 1; @@ -615,7 +611,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 0; /* Implementation defined -- write ignored */ - case REG(0xfd0) ... REG(0xfe4): + case 0xfd0 ... 0xfe4: goto write_ignore; /* R/O -- write ignore */ @@ -623,27 +619,27 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; /* Implementation defined -- write ignored */ - case REG(0xfec) ... REG(0xffc): + case 0xfec ... 0xffc: goto write_ignore; /* Reserved -- write ignored */ - case REG(0x00c) ... REG(0x01c): - case REG(0x040) ... REG(0x07c): - case REG(0x7fc): - case REG(0xbfc): - case REG(0xf04) ... REG(0xf0c): - case REG(0xf30) ... REG(0xfcc): + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: goto write_ignore; default: printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", - dabt.reg, *r, offset); + dabt.reg, *r, gicd_reg); return 0; } bad_width: printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", - dabt.size, dabt.reg, *r, offset); + dabt.size, dabt.reg, *r, gicd_reg); domain_crash_synchronous(); 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 Sun Jul 13 19:26:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPl-0006XY-8x; Sun, 13 Jul 2014 19:26:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPk-0006XO-6X for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:24 +0000 Received: from [193.109.254.147:29324] by server-14.bemta-14.messagelabs.com id DE/82-11800-F5DD2C35; Sun, 13 Jul 2014 19:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1405279579!12540177!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28177 invoked from network); 13 Jul 2014 19:26:20 -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; 13 Jul 2014 19:26:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPf-0003YQ-B4 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPf-0008Ax-9v for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:19 +0000 Date: Sun, 13 Jul 2014 19:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: split vgic driver into generic and vgic-v2 driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea37fd21110b6fbcf9257f814076a243d3873cb7 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:20 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:11 2014 +0100 xen/arm: split vgic driver into generic and vgic-v2 driver Existing vGIC driver has both generic code and hw specific code. Segregate vGIC low level driver into vgic-v2.c and keep generic code in existing vgic.c file. Some static generic functions in vgic.c is made as non-static so that these generic functions can be used in vGIC v2 driver. vGIC v2 driver registers required callbacks to generic vGIC driver. This helps to plug in next version of vGIC drivers like vGIC v3. These callbacks are registered per domain Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/vgic-v2.c | 506 ++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 500 +++++------------------------------------ xen/include/asm-arm/domain.h | 2 + xen/include/asm-arm/gic.h | 3 + xen/include/asm-arm/vgic.h | 17 ++ 6 files changed, 586 insertions(+), 444 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 969ee52..20f59f4 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -26,7 +26,7 @@ obj-y += smpboot.o obj-y += smp.o obj-y += shutdown.o obj-y += traps.o -obj-y += vgic.o +obj-y += vgic.o vgic-v2.o obj-y += vtimer.o obj-y += vuart.o obj-y += hvm.o diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c new file mode 100644 index 0000000..2102e43 --- /dev/null +++ b/xen/arch/arm/vgic-v2.c @@ -0,0 +1,506 @@ +/* + * xen/arch/arm/vgic-v2.c + * + * ARM Virtual Generic Interrupt Controller support v2 + * + * Ian Campbell + * Copyright (c) 2011 Citrix Systems. + * + * 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 +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + vgic_lock(v); + *r = v->domain->arch.vgic.ctlr; + vgic_unlock(v); + return 1; + case GICD_TYPER: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* No secure world support for guests. */ + vgic_lock(v); + *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) + |( ((v->domain->arch.vgic.nr_lines / 32)) & GICD_TYPE_LINES ); + vgic_unlock(v); + return 1; + case GICD_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* + * XXX Do we need a JEP106 manufacturer ID? + * Just use the physical h/w value for now + */ + *r = 0x0000043b; + return 1; + + /* Implementation defined -- read as zero */ + case 0x020 ... 0x03c: + goto read_as_zero; + + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->ienable; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->ienable; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->iactive; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->iactive; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ITARGETSR ... GICD_ITARGETSRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + + vgic_lock_rank(v, rank); + *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + + vgic_lock_rank(v, rank); + *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICFGR ... GICD_ICFGRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + + case GICD_SGIR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Write only -- read unknown */ + *r = 0xdeadbeef; + return 1; + + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + /* Implementation defined -- read as zero */ + case 0xfd0 ... 0xfe4: + goto read_as_zero; + + case GICD_ICPIDR2: + if ( dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled read from ICPIDR2\n"); + return 0; + + /* Implementation defined -- read as zero */ + case 0xfec ... 0xffc: + goto read_as_zero; + + /* Reserved -- read as zero */ + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: + goto read_as_zero; + + default: + printk("vGICD: unhandled read r%d offset %#08x\n", + dabt.reg, gicd_reg); + return 0; + } + +bad_width: + printk("vGICD: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicd_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) +{ + + int virq; + int irqmode; + enum gic_sgi_mode sgi_mode; + unsigned long vcpu_mask = 0; + + irqmode = (sgir & GICD_SGI_TARGET_LIST_MASK) >> GICD_SGI_TARGET_LIST_SHIFT; + virq = (sgir & GICD_SGI_INTID_MASK); + vcpu_mask = (sgir & GICD_SGI_TARGET_MASK) >> GICD_SGI_TARGET_SHIFT; + + /* Map GIC sgi value to enum value */ + switch ( irqmode ) + { + case GICD_SGI_TARGET_LIST_VAL: + sgi_mode = SGI_TARGET_LIST; + break; + case GICD_SGI_TARGET_OTHERS_VAL: + sgi_mode = SGI_TARGET_OTHERS; + break; + case GICD_SGI_TARGET_SELF_VAL: + sgi_mode = SGI_TARGET_SELF; + break; + default: + BUG(); + } + + return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); +} + +static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + uint32_t tr; + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Ignore all but the enable bit */ + v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + return 1; + + /* R/O -- write ignored */ + case GICD_TYPER: + case GICD_IIDR: + goto write_ignore; + + /* Implementation defined -- write ignored */ + case 0x020 ... 0x03c: + goto write_ignore; + + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + tr = rank->ienable; + rank->ienable |= *r; + vgic_unlock_rank(v, rank); + /* The virtual irq is derived from register offset. + * The register difference is word difference. So divide by 2(DABT_WORD) + * to get Virtual irq number */ + vgic_enable_irqs(v, (*r) & (~tr), + (gicd_reg - GICD_ISENABLER) >> DABT_WORD); + return 1; + + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + tr = rank->ienable; + rank->ienable &= ~*r; + vgic_unlock_rank(v, rank); + /* The virtual irq is derived from register offset. + * The register difference is word difference. So divide by 2(DABT_WORD) + * to get Virtual irq number */ + vgic_disable_irqs(v, (*r) & tr, + (gicd_reg - GICD_ICENABLER) >> DABT_WORD); + return 1; + + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); + return 0; + + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); + return 0; + + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ITARGETSR ... GICD_ITARGETSR + 7: + /* SGI/PPI target is read only */ + goto write_ignore; + + case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + if ( dabt.size == DABT_WORD ) + rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], *r, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, + gicd_reg - GICD_IPRIORITYR, DABT_WORD)], *r, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICFGR: /* SGIs */ + goto write_ignore; + case GICD_ICFGR + 1: /* PPIs */ + /* It is implementation defined if these are writeable. We chose not */ + goto write_ignore; + case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + + case GICD_SGIR: + if ( dabt.size != DABT_WORD ) goto bad_width; + return vgic_v2_to_sgi(v, *r); + + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); + return 0; + + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); + return 0; + + /* Implementation defined -- write ignored */ + case 0xfd0 ... 0xfe4: + goto write_ignore; + + /* R/O -- write ignore */ + case GICD_ICPIDR2: + goto write_ignore; + + /* Implementation defined -- write ignored */ + case 0xfec ... 0xffc: + goto write_ignore; + + /* Reserved -- write ignored */ + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: + goto write_ignore; + + default: + printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", + dabt.reg, *r, gicd_reg); + return 0; + } + +bad_width: + printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicd_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static const struct mmio_handler_ops vgic_v2_distr_mmio_handler = { + .read_handler = vgic_v2_distr_mmio_read, + .write_handler = vgic_v2_distr_mmio_write, +}; + +static int vgic_v2_vcpu_init(struct vcpu *v) +{ + int i; + + /* For SGI and PPI the target is always this CPU */ + for ( i = 0 ; i < 8 ; i++ ) + v->arch.vgic.private_irqs->itargets[i] = + (1<<(v->vcpu_id+0)) + | (1<<(v->vcpu_id+8)) + | (1<<(v->vcpu_id+16)) + | (1<<(v->vcpu_id+24)); + + return 0; +} + +static int vgic_v2_domain_init(struct domain *d) +{ + /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ + register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, + PAGE_SIZE); + + return 0; +} + +static const struct vgic_ops vgic_v2_ops = { + .vcpu_init = vgic_v2_vcpu_init, + .domain_init = vgic_v2_domain_init, +}; + +int vgic_v2_init(struct domain *d) +{ + register_vgic_ops(d, &vgic_v2_ops); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index c8fbf9b..1948316 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,14 +31,11 @@ #include #include -static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); -static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); - /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ -static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, +struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s) { int rank = REG_RANK_NR(b, (n >> s)); @@ -56,11 +53,6 @@ static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) return vgic_rank_offset(v, 8, irq, DABT_WORD); } -static const struct mmio_handler_ops vgic_distr_mmio_handler = { - .read_handler = vgic_distr_mmio_read, - .write_handler = vgic_distr_mmio_write, -}; - int domain_vgic_init(struct domain *d) { int i; @@ -75,6 +67,16 @@ int domain_vgic_init(struct domain *d) else d->arch.vgic.nr_lines = 0; /* We don't need SPIs for the guest */ + switch ( gic_hw_version() ) + { + case GIC_V2: + if ( vgic_v2_init(d) ) + return -ENODEV; + break; + default: + return -ENODEV; + } + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) @@ -96,15 +98,16 @@ int domain_vgic_init(struct domain *d) for (i=0; iarch.vgic.shared_irqs[i].lock); - /* - * We rely on gicv_setup() to initialize dbase(vGIC distributor base) - */ - register_mmio_handler(d, &vgic_distr_mmio_handler, - d->arch.vgic.dbase, PAGE_SIZE); + d->arch.vgic.handler->domain_init(d); return 0; } +void register_vgic_ops(struct domain *d, const struct vgic_ops *ops) +{ + d->arch.vgic.handler = ops; +} + void domain_vgic_free(struct domain *d) { xfree(d->arch.vgic.shared_irqs); @@ -121,6 +124,8 @@ int vcpu_vgic_init(struct vcpu *v) spin_lock_init(&v->arch.vgic.private_irqs->lock); + v->domain->arch.vgic.handler->vcpu_init(v); + memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) { @@ -128,13 +133,6 @@ int vcpu_vgic_init(struct vcpu *v) INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].lr_queue); } - /* For SGI and PPI the target is always this CPU */ - for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs->itargets[i] = - (1<<(v->vcpu_id+0)) - | (1<<(v->vcpu_id+8)) - | (1<<(v->vcpu_id+16)) - | (1<<(v->vcpu_id+24)); INIT_LIST_HEAD(&v->arch.vgic.inflight_irqs); INIT_LIST_HEAD(&v->arch.vgic.lr_pending); spin_lock_init(&v->arch.vgic.lock); @@ -148,205 +146,7 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } -static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) -{ - struct hsr_dabt dabt = info->dabt; - struct cpu_user_regs *regs = guest_cpu_user_regs(); - register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); - - switch ( gicd_reg ) - { - case GICD_CTLR: - if ( dabt.size != DABT_WORD ) goto bad_width; - vgic_lock(v); - *r = v->domain->arch.vgic.ctlr; - vgic_unlock(v); - return 1; - case GICD_TYPER: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* No secure world support for guests. */ - vgic_lock(v); - *r = ( (v->domain->max_vcpus<<5) & GICD_TYPE_CPUS ) - |( ((v->domain->arch.vgic.nr_lines/32)) & GICD_TYPE_LINES ); - vgic_unlock(v); - return 1; - case GICD_IIDR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* - * XXX Do we need a JEP106 manufacturer ID? - * Just use the physical h/w value for now - */ - *r = 0x0000043b; - return 1; - - /* Implementation defined -- read as zero */ - case 0x020 ... 0x03c: - goto read_as_zero; - - case GICD_IGROUPR ... GICD_IGROUPRN: - /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; - - case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->ienable; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->ienable; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->iactive; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->iactive; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ITARGETSR ... GICD_ITARGETSRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - - vgic_lock_rank(v, rank); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)]; - if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - - vgic_lock_rank(v, rank); - *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, - DABT_WORD)]; - if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICFGR ... GICD_ICFGRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_NSACR ... GICD_NSACRN: - /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; - - case GICD_SGIR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* Write only -- read unknown */ - *r = 0xdeadbeef; - return 1; - - case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - /* Implementation defined -- read as zero */ - case 0xfd0 ... 0xfe4: - goto read_as_zero; - - case GICD_ICPIDR2: - if ( dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled read from ICPIDR2\n"); - return 0; - - /* Implementation defined -- read as zero */ - case 0xfec ... 0xffc: - goto read_as_zero; - - /* Reserved -- read as zero */ - case 0x00c ... 0x01c: - case 0x040 ... 0x07c: - case 0x7fc: - case 0xbfc: - case 0xf04 ... 0xf0c: - case 0xf30 ... 0xfcc: - goto read_as_zero; - - default: - printk("vGICD: unhandled read r%d offset %#08x\n", - dabt.reg, gicd_reg); - return 0; - } - -bad_width: - printk("vGICD: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, gicd_reg); - domain_crash_synchronous(); - return 0; - -read_as_zero: - if ( dabt.size != DABT_WORD ) goto bad_width; - *r = 0; - return 1; -} - -static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) +void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { const unsigned long mask = r; struct pending_irq *p; @@ -369,7 +169,7 @@ static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) } } -static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) +void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { const unsigned long mask = r; struct pending_irq *p; @@ -405,246 +205,60 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } } -static int vgic_to_sgi(struct vcpu *v, register_t sgir) +/* TODO: unsigned long is used to fit vcpu_mask.*/ +int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, + unsigned long vcpu_mask) { struct domain *d = v->domain; - int virtual_irq; - int filter; int vcpuid; int i; - unsigned long vcpu_mask = 0; ASSERT(d->max_vcpus < 8*sizeof(vcpu_mask)); - filter = (sgir & GICD_SGI_TARGET_LIST_MASK); - virtual_irq = (sgir & GICD_SGI_INTID_MASK); - ASSERT( virtual_irq < 16 ); + ASSERT( virq < 16 ); - switch ( filter ) + switch ( irqmode ) { - case GICD_SGI_TARGET_LIST: - vcpu_mask = (sgir & GICD_SGI_TARGET_MASK) >> GICD_SGI_TARGET_SHIFT; - break; - case GICD_SGI_TARGET_OTHERS: - for ( i = 0; i < d->max_vcpus; i++ ) - { - if ( i != current->vcpu_id && d->vcpu[i] != NULL && - is_vcpu_online(d->vcpu[i]) ) - set_bit(i, &vcpu_mask); - } - break; - case GICD_SGI_TARGET_SELF: - set_bit(current->vcpu_id, &vcpu_mask); - break; - default: - gdprintk(XENLOG_WARNING, "vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong TargetListFilter field\n", - sgir); - return 0; + case SGI_TARGET_LIST: + break; + case SGI_TARGET_OTHERS: + /* + * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and + * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 + */ + vcpu_mask = 0; + for ( i = 0; i < d->max_vcpus; i++ ) + { + if ( i != current->vcpu_id && d->vcpu[i] != NULL && + is_vcpu_online(d->vcpu[i]) ) + set_bit(i, &vcpu_mask); + } + break; + case SGI_TARGET_SELF: + /* + * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and + * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 + */ + vcpu_mask = 0; + set_bit(current->vcpu_id, &vcpu_mask); + break; + default: + gdprintk(XENLOG_WARNING, + "vGICD:unhandled GICD_SGIR write %"PRIregister" \ + with wrong mode\n", sgir); + return 0; } for_each_set_bit( vcpuid, &vcpu_mask, d->max_vcpus ) { if ( d->vcpu[vcpuid] != NULL && !is_vcpu_online(d->vcpu[vcpuid]) ) { - gdprintk(XENLOG_WARNING, "vGICD: GICD_SGIR write r=%"PRIregister" vcpu_mask=%lx, wrong CPUTargetList\n", - sgir, vcpu_mask); + gdprintk(XENLOG_WARNING, "VGIC: write r=%"PRIregister" \ + vcpu_mask=%lx, wrong CPUTargetList\n", sgir, vcpu_mask); continue; } - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq); - } - return 1; -} - -static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) -{ - struct hsr_dabt dabt = info->dabt; - struct cpu_user_regs *regs = guest_cpu_user_regs(); - register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); - uint32_t tr; - - switch ( gicd_reg ) - { - case GICD_CTLR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* Ignore all but the enable bit */ - v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; - return 1; - - /* R/O -- write ignored */ - case GICD_TYPER: - case GICD_IIDR: - goto write_ignore; - - /* Implementation defined -- write ignored */ - case 0x020 ... 0x03c: - goto write_ignore; - - case GICD_IGROUPR ... GICD_IGROUPRN: - /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; - - case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - tr = rank->ienable; - rank->ienable |= *r; - vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), - (gicd_reg - GICD_ISENABLER) >> DABT_WORD); - return 1; - - case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - tr = rank->ienable; - rank->ienable &= ~*r; - vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, - (gicd_reg - GICD_ICENABLER) >> DABT_WORD); - return 1; - - case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); - return 0; - - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); - return 0; - - case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ITARGETSR ... GICD_ITARGETSR + 7: - /* SGI/PPI target is read only */ - goto write_ignore; - - case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - if ( dabt.size == DABT_WORD ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = *r; - else - { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - vgic_byte_write(&rank->itargets[tr], *r, gicd_reg); - } - vgic_unlock_rank(v, rank); - return 1; - - case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - if ( dabt.size == DABT_WORD ) - rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, - DABT_WORD)] = *r; - else - { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - vgic_byte_write(&rank->ipriority[tr], *r, gicd_reg); - } - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICFGR: /* SGIs */ - goto write_ignore; - case GICD_ICFGR + 1: /* PPIs */ - /* It is implementation defined if these are writeable. We chose not */ - goto write_ignore; - case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_NSACR ... GICD_NSACRN: - /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; - - case GICD_SGIR: - if ( dabt.size != 2 ) - goto bad_width; - return vgic_to_sgi(v, *r); - - case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); - return 0; - - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); - return 0; - - /* Implementation defined -- write ignored */ - case 0xfd0 ... 0xfe4: - goto write_ignore; - - /* R/O -- write ignore */ - case GICD_ICPIDR2: - goto write_ignore; - - /* Implementation defined -- write ignored */ - case 0xfec ... 0xffc: - goto write_ignore; - - /* Reserved -- write ignored */ - case 0x00c ... 0x01c: - case 0x040 ... 0x07c: - case 0x7fc: - case 0xbfc: - case 0xf04 ... 0xf0c: - case 0xf30 ... 0xfcc: - goto write_ignore; - - default: - printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", - dabt.reg, *r, gicd_reg); - return 0; + vgic_vcpu_inject_irq(d->vcpu[vcpuid], virq); } - -bad_width: - printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", - dabt.size, dabt.reg, *r, gicd_reg); - domain_crash_synchronous(); - return 0; - -write_ignore: - if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 2a1e976..32d0554 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -76,6 +76,8 @@ struct arch_domain } virt_timer_base; struct { + /* GIC HW version specific vGIC driver handler */ + const struct vgic_ops *handler; /* * Covers access to other members of this struct _except_ for * shared_irqs where each member contains its own locking. diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 875729e..a0c07bf 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -53,8 +53,11 @@ #define GICD_SGI_TARGET_LIST_SHIFT (24) #define GICD_SGI_TARGET_LIST_MASK (0x3UL << GICD_SGI_TARGET_LIST_SHIFT) #define GICD_SGI_TARGET_LIST (0UL<arch.vgic.nr_lines+31)/32) @@ -133,6 +140,8 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) *reg |= var; } +enum gic_sgi_mode; + /* * Offset of GICD_ with its rank, for GICD_ size with * -bits-per-interrupt. @@ -145,8 +154,16 @@ extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); +extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); +extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); +extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); +extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); +int vgic_v2_init(struct domain *d); extern int vcpu_vgic_free(struct vcpu *v); +extern int vgic_to_sgi(struct vcpu *v, register_t sgir, + enum gic_sgi_mode irqmode, int virq, + unsigned long vcpu_mask); #endif /* __ASM_ARM_VGIC_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 Sun Jul 13 19:26:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPl-0006XY-8x; Sun, 13 Jul 2014 19:26:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPk-0006XO-6X for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:24 +0000 Received: from [193.109.254.147:29324] by server-14.bemta-14.messagelabs.com id DE/82-11800-F5DD2C35; Sun, 13 Jul 2014 19:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1405279579!12540177!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28177 invoked from network); 13 Jul 2014 19:26:20 -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; 13 Jul 2014 19:26:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPf-0003YQ-B4 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPf-0008Ax-9v for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:19 +0000 Date: Sun, 13 Jul 2014 19:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: split vgic driver into generic and vgic-v2 driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea37fd21110b6fbcf9257f814076a243d3873cb7 Author: Vijaya Kumar K AuthorDate: Wed Jul 9 10:26:20 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jul 10 13:43:11 2014 +0100 xen/arm: split vgic driver into generic and vgic-v2 driver Existing vGIC driver has both generic code and hw specific code. Segregate vGIC low level driver into vgic-v2.c and keep generic code in existing vgic.c file. Some static generic functions in vgic.c is made as non-static so that these generic functions can be used in vGIC v2 driver. vGIC v2 driver registers required callbacks to generic vGIC driver. This helps to plug in next version of vGIC drivers like vGIC v3. These callbacks are registered per domain Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/vgic-v2.c | 506 ++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 500 +++++------------------------------------ xen/include/asm-arm/domain.h | 2 + xen/include/asm-arm/gic.h | 3 + xen/include/asm-arm/vgic.h | 17 ++ 6 files changed, 586 insertions(+), 444 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 969ee52..20f59f4 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -26,7 +26,7 @@ obj-y += smpboot.o obj-y += smp.o obj-y += shutdown.o obj-y += traps.o -obj-y += vgic.o +obj-y += vgic.o vgic-v2.o obj-y += vtimer.o obj-y += vuart.o obj-y += hvm.o diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c new file mode 100644 index 0000000..2102e43 --- /dev/null +++ b/xen/arch/arm/vgic-v2.c @@ -0,0 +1,506 @@ +/* + * xen/arch/arm/vgic-v2.c + * + * ARM Virtual Generic Interrupt Controller support v2 + * + * Ian Campbell + * Copyright (c) 2011 Citrix Systems. + * + * 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 +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + vgic_lock(v); + *r = v->domain->arch.vgic.ctlr; + vgic_unlock(v); + return 1; + case GICD_TYPER: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* No secure world support for guests. */ + vgic_lock(v); + *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) + |( ((v->domain->arch.vgic.nr_lines / 32)) & GICD_TYPE_LINES ); + vgic_unlock(v); + return 1; + case GICD_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* + * XXX Do we need a JEP106 manufacturer ID? + * Just use the physical h/w value for now + */ + *r = 0x0000043b; + return 1; + + /* Implementation defined -- read as zero */ + case 0x020 ... 0x03c: + goto read_as_zero; + + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->ienable; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->ienable; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->iactive; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->iactive; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ITARGETSR ... GICD_ITARGETSRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + + vgic_lock_rank(v, rank); + *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + + vgic_lock_rank(v, rank); + *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICFGR ... GICD_ICFGRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + + case GICD_SGIR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Write only -- read unknown */ + *r = 0xdeadbeef; + return 1; + + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); + if ( rank == NULL) goto read_as_zero; + vgic_lock_rank(v, rank); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + /* Implementation defined -- read as zero */ + case 0xfd0 ... 0xfe4: + goto read_as_zero; + + case GICD_ICPIDR2: + if ( dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled read from ICPIDR2\n"); + return 0; + + /* Implementation defined -- read as zero */ + case 0xfec ... 0xffc: + goto read_as_zero; + + /* Reserved -- read as zero */ + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: + goto read_as_zero; + + default: + printk("vGICD: unhandled read r%d offset %#08x\n", + dabt.reg, gicd_reg); + return 0; + } + +bad_width: + printk("vGICD: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicd_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) +{ + + int virq; + int irqmode; + enum gic_sgi_mode sgi_mode; + unsigned long vcpu_mask = 0; + + irqmode = (sgir & GICD_SGI_TARGET_LIST_MASK) >> GICD_SGI_TARGET_LIST_SHIFT; + virq = (sgir & GICD_SGI_INTID_MASK); + vcpu_mask = (sgir & GICD_SGI_TARGET_MASK) >> GICD_SGI_TARGET_SHIFT; + + /* Map GIC sgi value to enum value */ + switch ( irqmode ) + { + case GICD_SGI_TARGET_LIST_VAL: + sgi_mode = SGI_TARGET_LIST; + break; + case GICD_SGI_TARGET_OTHERS_VAL: + sgi_mode = SGI_TARGET_OTHERS; + break; + case GICD_SGI_TARGET_SELF_VAL: + sgi_mode = SGI_TARGET_SELF; + break; + default: + BUG(); + } + + return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); +} + +static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + uint32_t tr; + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Ignore all but the enable bit */ + v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + return 1; + + /* R/O -- write ignored */ + case GICD_TYPER: + case GICD_IIDR: + goto write_ignore; + + /* Implementation defined -- write ignored */ + case 0x020 ... 0x03c: + goto write_ignore; + + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + tr = rank->ienable; + rank->ienable |= *r; + vgic_unlock_rank(v, rank); + /* The virtual irq is derived from register offset. + * The register difference is word difference. So divide by 2(DABT_WORD) + * to get Virtual irq number */ + vgic_enable_irqs(v, (*r) & (~tr), + (gicd_reg - GICD_ISENABLER) >> DABT_WORD); + return 1; + + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + tr = rank->ienable; + rank->ienable &= ~*r; + vgic_unlock_rank(v, rank); + /* The virtual irq is derived from register offset. + * The register difference is word difference. So divide by 2(DABT_WORD) + * to get Virtual irq number */ + vgic_disable_irqs(v, (*r) & tr, + (gicd_reg - GICD_ICENABLER) >> DABT_WORD); + return 1; + + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); + return 0; + + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); + return 0; + + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ITARGETSR ... GICD_ITARGETSR + 7: + /* SGI/PPI target is read only */ + goto write_ignore; + + case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + if ( dabt.size == DABT_WORD ) + rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], *r, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, + gicd_reg - GICD_IPRIORITYR, DABT_WORD)], *r, gicd_reg); + vgic_unlock_rank(v, rank); + return 1; + + case GICD_ICFGR: /* SGIs */ + goto write_ignore; + case GICD_ICFGR + 1: /* PPIs */ + /* It is implementation defined if these are writeable. We chose not */ + goto write_ignore; + case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL) goto write_ignore; + vgic_lock_rank(v, rank); + rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; + vgic_unlock_rank(v, rank); + return 1; + + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + + case GICD_SGIR: + if ( dabt.size != DABT_WORD ) goto bad_width; + return vgic_v2_to_sgi(v, *r); + + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); + return 0; + + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", + dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); + return 0; + + /* Implementation defined -- write ignored */ + case 0xfd0 ... 0xfe4: + goto write_ignore; + + /* R/O -- write ignore */ + case GICD_ICPIDR2: + goto write_ignore; + + /* Implementation defined -- write ignored */ + case 0xfec ... 0xffc: + goto write_ignore; + + /* Reserved -- write ignored */ + case 0x00c ... 0x01c: + case 0x040 ... 0x07c: + case 0x7fc: + case 0xbfc: + case 0xf04 ... 0xf0c: + case 0xf30 ... 0xfcc: + goto write_ignore; + + default: + printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", + dabt.reg, *r, gicd_reg); + return 0; + } + +bad_width: + printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicd_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static const struct mmio_handler_ops vgic_v2_distr_mmio_handler = { + .read_handler = vgic_v2_distr_mmio_read, + .write_handler = vgic_v2_distr_mmio_write, +}; + +static int vgic_v2_vcpu_init(struct vcpu *v) +{ + int i; + + /* For SGI and PPI the target is always this CPU */ + for ( i = 0 ; i < 8 ; i++ ) + v->arch.vgic.private_irqs->itargets[i] = + (1<<(v->vcpu_id+0)) + | (1<<(v->vcpu_id+8)) + | (1<<(v->vcpu_id+16)) + | (1<<(v->vcpu_id+24)); + + return 0; +} + +static int vgic_v2_domain_init(struct domain *d) +{ + /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ + register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, + PAGE_SIZE); + + return 0; +} + +static const struct vgic_ops vgic_v2_ops = { + .vcpu_init = vgic_v2_vcpu_init, + .domain_init = vgic_v2_domain_init, +}; + +int vgic_v2_init(struct domain *d) +{ + register_vgic_ops(d, &vgic_v2_ops); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index c8fbf9b..1948316 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,14 +31,11 @@ #include #include -static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); -static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); - /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. */ -static struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, +struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s) { int rank = REG_RANK_NR(b, (n >> s)); @@ -56,11 +53,6 @@ static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) return vgic_rank_offset(v, 8, irq, DABT_WORD); } -static const struct mmio_handler_ops vgic_distr_mmio_handler = { - .read_handler = vgic_distr_mmio_read, - .write_handler = vgic_distr_mmio_write, -}; - int domain_vgic_init(struct domain *d) { int i; @@ -75,6 +67,16 @@ int domain_vgic_init(struct domain *d) else d->arch.vgic.nr_lines = 0; /* We don't need SPIs for the guest */ + switch ( gic_hw_version() ) + { + case GIC_V2: + if ( vgic_v2_init(d) ) + return -ENODEV; + break; + default: + return -ENODEV; + } + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) @@ -96,15 +98,16 @@ int domain_vgic_init(struct domain *d) for (i=0; iarch.vgic.shared_irqs[i].lock); - /* - * We rely on gicv_setup() to initialize dbase(vGIC distributor base) - */ - register_mmio_handler(d, &vgic_distr_mmio_handler, - d->arch.vgic.dbase, PAGE_SIZE); + d->arch.vgic.handler->domain_init(d); return 0; } +void register_vgic_ops(struct domain *d, const struct vgic_ops *ops) +{ + d->arch.vgic.handler = ops; +} + void domain_vgic_free(struct domain *d) { xfree(d->arch.vgic.shared_irqs); @@ -121,6 +124,8 @@ int vcpu_vgic_init(struct vcpu *v) spin_lock_init(&v->arch.vgic.private_irqs->lock); + v->domain->arch.vgic.handler->vcpu_init(v); + memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) { @@ -128,13 +133,6 @@ int vcpu_vgic_init(struct vcpu *v) INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].lr_queue); } - /* For SGI and PPI the target is always this CPU */ - for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs->itargets[i] = - (1<<(v->vcpu_id+0)) - | (1<<(v->vcpu_id+8)) - | (1<<(v->vcpu_id+16)) - | (1<<(v->vcpu_id+24)); INIT_LIST_HEAD(&v->arch.vgic.inflight_irqs); INIT_LIST_HEAD(&v->arch.vgic.lr_pending); spin_lock_init(&v->arch.vgic.lock); @@ -148,205 +146,7 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } -static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) -{ - struct hsr_dabt dabt = info->dabt; - struct cpu_user_regs *regs = guest_cpu_user_regs(); - register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); - - switch ( gicd_reg ) - { - case GICD_CTLR: - if ( dabt.size != DABT_WORD ) goto bad_width; - vgic_lock(v); - *r = v->domain->arch.vgic.ctlr; - vgic_unlock(v); - return 1; - case GICD_TYPER: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* No secure world support for guests. */ - vgic_lock(v); - *r = ( (v->domain->max_vcpus<<5) & GICD_TYPE_CPUS ) - |( ((v->domain->arch.vgic.nr_lines/32)) & GICD_TYPE_LINES ); - vgic_unlock(v); - return 1; - case GICD_IIDR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* - * XXX Do we need a JEP106 manufacturer ID? - * Just use the physical h/w value for now - */ - *r = 0x0000043b; - return 1; - - /* Implementation defined -- read as zero */ - case 0x020 ... 0x03c: - goto read_as_zero; - - case GICD_IGROUPR ... GICD_IGROUPRN: - /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; - - case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->ienable; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->ienable; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->iactive; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->iactive; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ITARGETSR ... GICD_ITARGETSRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - - vgic_lock_rank(v, rank); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)]; - if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != 0 && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - - vgic_lock_rank(v, rank); - *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, - DABT_WORD)]; - if ( dabt.size == DABT_BYTE ) - *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICFGR ... GICD_ICFGRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_NSACR ... GICD_NSACRN: - /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; - - case GICD_SGIR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* Write only -- read unknown */ - *r = 0xdeadbeef; - return 1; - - case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); - return 1; - - /* Implementation defined -- read as zero */ - case 0xfd0 ... 0xfe4: - goto read_as_zero; - - case GICD_ICPIDR2: - if ( dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled read from ICPIDR2\n"); - return 0; - - /* Implementation defined -- read as zero */ - case 0xfec ... 0xffc: - goto read_as_zero; - - /* Reserved -- read as zero */ - case 0x00c ... 0x01c: - case 0x040 ... 0x07c: - case 0x7fc: - case 0xbfc: - case 0xf04 ... 0xf0c: - case 0xf30 ... 0xfcc: - goto read_as_zero; - - default: - printk("vGICD: unhandled read r%d offset %#08x\n", - dabt.reg, gicd_reg); - return 0; - } - -bad_width: - printk("vGICD: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, gicd_reg); - domain_crash_synchronous(); - return 0; - -read_as_zero: - if ( dabt.size != DABT_WORD ) goto bad_width; - *r = 0; - return 1; -} - -static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) +void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { const unsigned long mask = r; struct pending_irq *p; @@ -369,7 +169,7 @@ static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) } } -static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) +void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { const unsigned long mask = r; struct pending_irq *p; @@ -405,246 +205,60 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } } -static int vgic_to_sgi(struct vcpu *v, register_t sgir) +/* TODO: unsigned long is used to fit vcpu_mask.*/ +int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, + unsigned long vcpu_mask) { struct domain *d = v->domain; - int virtual_irq; - int filter; int vcpuid; int i; - unsigned long vcpu_mask = 0; ASSERT(d->max_vcpus < 8*sizeof(vcpu_mask)); - filter = (sgir & GICD_SGI_TARGET_LIST_MASK); - virtual_irq = (sgir & GICD_SGI_INTID_MASK); - ASSERT( virtual_irq < 16 ); + ASSERT( virq < 16 ); - switch ( filter ) + switch ( irqmode ) { - case GICD_SGI_TARGET_LIST: - vcpu_mask = (sgir & GICD_SGI_TARGET_MASK) >> GICD_SGI_TARGET_SHIFT; - break; - case GICD_SGI_TARGET_OTHERS: - for ( i = 0; i < d->max_vcpus; i++ ) - { - if ( i != current->vcpu_id && d->vcpu[i] != NULL && - is_vcpu_online(d->vcpu[i]) ) - set_bit(i, &vcpu_mask); - } - break; - case GICD_SGI_TARGET_SELF: - set_bit(current->vcpu_id, &vcpu_mask); - break; - default: - gdprintk(XENLOG_WARNING, "vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong TargetListFilter field\n", - sgir); - return 0; + case SGI_TARGET_LIST: + break; + case SGI_TARGET_OTHERS: + /* + * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and + * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 + */ + vcpu_mask = 0; + for ( i = 0; i < d->max_vcpus; i++ ) + { + if ( i != current->vcpu_id && d->vcpu[i] != NULL && + is_vcpu_online(d->vcpu[i]) ) + set_bit(i, &vcpu_mask); + } + break; + case SGI_TARGET_SELF: + /* + * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and + * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 + */ + vcpu_mask = 0; + set_bit(current->vcpu_id, &vcpu_mask); + break; + default: + gdprintk(XENLOG_WARNING, + "vGICD:unhandled GICD_SGIR write %"PRIregister" \ + with wrong mode\n", sgir); + return 0; } for_each_set_bit( vcpuid, &vcpu_mask, d->max_vcpus ) { if ( d->vcpu[vcpuid] != NULL && !is_vcpu_online(d->vcpu[vcpuid]) ) { - gdprintk(XENLOG_WARNING, "vGICD: GICD_SGIR write r=%"PRIregister" vcpu_mask=%lx, wrong CPUTargetList\n", - sgir, vcpu_mask); + gdprintk(XENLOG_WARNING, "VGIC: write r=%"PRIregister" \ + vcpu_mask=%lx, wrong CPUTargetList\n", sgir, vcpu_mask); continue; } - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq); - } - return 1; -} - -static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) -{ - struct hsr_dabt dabt = info->dabt; - struct cpu_user_regs *regs = guest_cpu_user_regs(); - register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); - uint32_t tr; - - switch ( gicd_reg ) - { - case GICD_CTLR: - if ( dabt.size != DABT_WORD ) goto bad_width; - /* Ignore all but the enable bit */ - v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; - return 1; - - /* R/O -- write ignored */ - case GICD_TYPER: - case GICD_IIDR: - goto write_ignore; - - /* Implementation defined -- write ignored */ - case 0x020 ... 0x03c: - goto write_ignore; - - case GICD_IGROUPR ... GICD_IGROUPRN: - /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; - - case GICD_ISENABLER ... GICD_ISENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - tr = rank->ienable; - rank->ienable |= *r; - vgic_unlock_rank(v, rank); - vgic_enable_irqs(v, (*r) & (~tr), - (gicd_reg - GICD_ISENABLER) >> DABT_WORD); - return 1; - - case GICD_ICENABLER ... GICD_ICENABLERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - tr = rank->ienable; - rank->ienable &= ~*r; - vgic_unlock_rank(v, rank); - vgic_disable_irqs(v, (*r) & tr, - (gicd_reg - GICD_ICENABLER) >> DABT_WORD); - return 1; - - case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); - return 0; - - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); - return 0; - - case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ITARGETSR ... GICD_ITARGETSR + 7: - /* SGI/PPI target is read only */ - goto write_ignore; - - case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - if ( dabt.size == DABT_WORD ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = *r; - else - { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD); - vgic_byte_write(&rank->itargets[tr], *r, gicd_reg); - } - vgic_unlock_rank(v, rank); - return 1; - - case GICD_IPRIORITYR ... GICD_IPRIORITYRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - if ( dabt.size == DABT_WORD ) - rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, - DABT_WORD)] = *r; - else - { - tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); - vgic_byte_write(&rank->ipriority[tr], *r, gicd_reg); - } - vgic_unlock_rank(v, rank); - return 1; - - case GICD_ICFGR: /* SGIs */ - goto write_ignore; - case GICD_ICFGR + 1: /* PPIs */ - /* It is implementation defined if these are writeable. We chose not */ - goto write_ignore; - case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); - rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; - vgic_unlock_rank(v, rank); - return 1; - - case GICD_NSACR ... GICD_NSACRN: - /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; - - case GICD_SGIR: - if ( dabt.size != 2 ) - goto bad_width; - return vgic_to_sgi(v, *r); - - case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ICPENDSGIR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_CPENDSGIR); - return 0; - - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - printk("vGICD: unhandled %s write %#"PRIregister" to ISPENDSGIR%d\n", - dabt.size ? "word" : "byte", *r, gicd_reg - GICD_SPENDSGIR); - return 0; - - /* Implementation defined -- write ignored */ - case 0xfd0 ... 0xfe4: - goto write_ignore; - - /* R/O -- write ignore */ - case GICD_ICPIDR2: - goto write_ignore; - - /* Implementation defined -- write ignored */ - case 0xfec ... 0xffc: - goto write_ignore; - - /* Reserved -- write ignored */ - case 0x00c ... 0x01c: - case 0x040 ... 0x07c: - case 0x7fc: - case 0xbfc: - case 0xf04 ... 0xf0c: - case 0xf30 ... 0xfcc: - goto write_ignore; - - default: - printk("vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", - dabt.reg, *r, gicd_reg); - return 0; + vgic_vcpu_inject_irq(d->vcpu[vcpuid], virq); } - -bad_width: - printk("vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", - dabt.size, dabt.reg, *r, gicd_reg); - domain_crash_synchronous(); - return 0; - -write_ignore: - if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 2a1e976..32d0554 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -76,6 +76,8 @@ struct arch_domain } virt_timer_base; struct { + /* GIC HW version specific vGIC driver handler */ + const struct vgic_ops *handler; /* * Covers access to other members of this struct _except_ for * shared_irqs where each member contains its own locking. diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 875729e..a0c07bf 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -53,8 +53,11 @@ #define GICD_SGI_TARGET_LIST_SHIFT (24) #define GICD_SGI_TARGET_LIST_MASK (0x3UL << GICD_SGI_TARGET_LIST_SHIFT) #define GICD_SGI_TARGET_LIST (0UL<arch.vgic.nr_lines+31)/32) @@ -133,6 +140,8 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) *reg |= var; } +enum gic_sgi_mode; + /* * Offset of GICD_ with its rank, for GICD_ size with * -bits-per-interrupt. @@ -145,8 +154,16 @@ extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); +extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); +extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); +extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); +extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); +int vgic_v2_init(struct domain *d); extern int vcpu_vgic_free(struct vcpu *v); +extern int vgic_to_sgi(struct vcpu *v, register_t sgir, + enum gic_sgi_mode irqmode, int virq, + unsigned long vcpu_mask); #endif /* __ASM_ARM_VGIC_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 Sun Jul 13 19:26:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPw-0006ZX-EY; Sun, 13 Jul 2014 19:26:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPu-0006ZC-Ly for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:35 +0000 Received: from [85.158.143.35:28990] by server-1.bemta-4.messagelabs.com id D0/91-30046-96DD2C35; Sun, 13 Jul 2014 19:26:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1405279589!17360325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1841 invoked from network); 13 Jul 2014 19:26:30 -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; 13 Jul 2014 19:26:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPp-0003YY-Fm for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPp-0008BJ-EO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:29 +0000 Date: Sun, 13 Jul 2014 19:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use superpages in p2m when pages are suitably aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5df01f6e2653ba38b3c55ef137dfc83fb99fad70 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:45 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:36:24 2014 +0100 xen: arm: use superpages in p2m when pages are suitably aligned This creates superpage (1G and 2M) mappings in the p2m for both domU and dom0 when the guest and machine addresses are suitably aligned. This relies on the domain builder to allocate suitably sized regions, this is trivially true for 1:1 mapped dom0's and was arranged for guests in a previous patch. A non-1:1 dom0's memory is not currently deliberately aligned. Since ARM pagetables are (mostly) consistent at each level this is implemented by refactoring the handling of a single level of pagetable into a common function. The two inconsistencies are that there are no superpage mappings at level zero and that level three entry mappings must set the table bit. When inserting new mappings the code shatters superpage mappings as necessary, but currently makes no attempt to coalesce anything again. In particular when inserting a mapping which could be a superpage over an existing table mapping we do not attempt to free that lower page table and instead descend into it. Some p2m statistics are added to keep track of the number of each level of mapping and the number of times we've had to shatter an existing mapping. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 1 + xen/arch/arm/p2m.c | 498 ++++++++++++++++++++++++++++++++++----------- xen/include/asm-arm/p2m.h | 12 + 3 files changed, 390 insertions(+), 121 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 0c16f23..87902ef 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -761,6 +761,7 @@ int domain_relinquish_resources(struct domain *d) void arch_dump_domain_info(struct domain *d) { + p2m_dump_info(d); } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index cb22e9c..c0c011a 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -25,12 +26,26 @@ static bool_t p2m_table(lpae_t pte) { return p2m_valid(pte) && pte.p2m.table; } -#if 0 static bool_t p2m_mapping(lpae_t pte) { return p2m_valid(pte) && !pte.p2m.table; } -#endif + +void p2m_dump_info(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + spin_lock(&p2m->lock); + printk("p2m mappings for domain %d (vmid %d):\n", + d->domain_id, p2m->vmid); + BUG_ON(p2m->stats.mappings[0] || p2m->stats.shattered[0]); + printk(" 1G mappings: %ld (shattered %ld)\n", + p2m->stats.mappings[1], p2m->stats.shattered[1]); + printk(" 2M mappings: %ld (shattered %ld)\n", + p2m->stats.mappings[2], p2m->stats.shattered[2]); + printk(" 4K mappings: %ld\n", p2m->stats.mappings[3]); + spin_unlock(&p2m->lock); +} void dump_p2m_lookup(struct domain *d, paddr_t addr) { @@ -287,15 +302,26 @@ static inline void p2m_write_pte(lpae_t *p, lpae_t pte, bool_t flush_cache) clean_xen_dcache(*p); } -/* Allocate a new page table page and hook it in via the given entry */ -static int p2m_create_table(struct domain *d, lpae_t *entry, bool_t flush_cache) +/* + * Allocate a new page table page and hook it in via the given entry. + * apply_one_level relies on this returning 0 on success + * and -ve on failure. + * + * If the existing entry is present then it must be a mapping and not + * a table and it will be shattered into the next level down. + * + * level_shift is the number of bits at the level we want to create. + */ +static int p2m_create_table(struct domain *d, lpae_t *entry, + int level_shift, bool_t flush_cache) { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; - void *p; + lpae_t *p; lpae_t pte; + int splitting = p2m_valid(*entry); - BUG_ON(entry->p2m.valid); + BUG_ON(p2m_table(*entry)); page = alloc_domheap_page(NULL, 0); if ( page == NULL ) @@ -304,9 +330,37 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, bool_t flush_cache) page_list_add(page, &p2m->pages); p = __map_domain_page(page); - clear_page(p); + if ( splitting ) + { + p2m_type_t t = entry->p2m.type; + unsigned long base_pfn = entry->p2m.base; + int i; + + /* + * We are either splitting a first level 1G page into 512 second level + * 2M pages, or a second level 2M page into 512 third level 4K pages. + */ + for ( i=0 ; i < LPAE_ENTRIES; i++ ) + { + pte = mfn_to_p2m_entry(base_pfn + (i<<(level_shift-LPAE_SHIFT)), + MATTR_MEM, t); + + /* + * First and second level super pages set p2m.table = 0, but + * third level entries set table = 1. + */ + if ( level_shift - LPAE_SHIFT ) + pte.p2m.table = 0; + + write_pte(&p[i], pte); + } + } + else + clear_page(p); + if ( flush_cache ) clean_xen_dcache_va_range(p, PAGE_SIZE); + unmap_domain_page(p); pte = mfn_to_p2m_entry(page_to_mfn(page), MATTR_MEM, p2m_invalid); @@ -324,8 +378,14 @@ enum p2m_operation { CACHEFLUSH, }; -static void p2m_put_page(const lpae_t pte) +/* Put any references on the single 4K page referenced by pte. TODO: + * Handle superpages, for now we only take special references for leaf + * pages (specifically foreign ones, which can't be super mapped today). + */ +static void p2m_put_l3_page(const lpae_t pte) { + ASSERT(p2m_valid(pte)); + /* TODO: Handle other p2m types * * It's safe to do the put_page here because page_alloc will @@ -341,6 +401,265 @@ static void p2m_put_page(const lpae_t pte) } } +/* + * Returns true if start_gpaddr..end_gpaddr contains at least one + * suitably aligned level_size mappping of maddr. + * + * So long as the range is large enough the end_gpaddr need not be + * aligned (callers should create one superpage mapping based on this + * result and then call this again on the new range, eventually the + * slop at the end will cause this function to return false). + */ +static bool_t is_mapping_aligned(const paddr_t start_gpaddr, + const paddr_t end_gpaddr, + const paddr_t maddr, + const paddr_t level_size) +{ + const paddr_t level_mask = level_size - 1; + + /* No hardware superpages at level 0 */ + if ( level_size == ZEROETH_SIZE ) + return false; + + /* + * A range smaller than the size of a superpage at this level + * cannot be superpage aligned. + */ + if ( ( end_gpaddr - start_gpaddr ) < level_size - 1 ) + return false; + + /* Both the gpaddr and maddr must be aligned */ + if ( start_gpaddr & level_mask ) + return false; + if ( maddr & level_mask ) + return false; + return true; +} + +#define P2M_ONE_DESCEND 0 +#define P2M_ONE_PROGRESS_NOP 0x1 +#define P2M_ONE_PROGRESS 0x10 + +/* + * 0 == (P2M_ONE_DESCEND) continue to descend the tree + * +ve == (P2M_ONE_PROGRESS_*) handled at this level, continue, flush, + * entry, addr and maddr updated. Return value is an + * indication of the amount of work done (for preemption). + * -ve == (-Exxx) error. + */ +static int apply_one_level(struct domain *d, + lpae_t *entry, + unsigned int level, + bool_t flush_cache, + enum p2m_operation op, + paddr_t start_gpaddr, + paddr_t end_gpaddr, + paddr_t *addr, + paddr_t *maddr, + bool_t *flush, + int mattr, + p2m_type_t t) +{ + /* Helpers to lookup the properties of each level */ + const paddr_t level_sizes[] = + { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; + const paddr_t level_masks[] = + { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; + const paddr_t level_shifts[] = + { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; + const paddr_t level_size = level_sizes[level]; + const paddr_t level_mask = level_masks[level]; + const paddr_t level_shift = level_shifts[level]; + + struct p2m_domain *p2m = &d->arch.p2m; + lpae_t pte; + const lpae_t orig_pte = *entry; + int rc; + + BUG_ON(level > 3); + + switch ( op ) + { + case ALLOCATE: + ASSERT(level < 3 || !p2m_valid(orig_pte)); + ASSERT(*maddr == 0); + + if ( p2m_valid(orig_pte) ) + return P2M_ONE_DESCEND; + + if ( is_mapping_aligned(*addr, end_gpaddr, 0, level_size) ) + { + struct page_info *page; + + page = alloc_domheap_pages(d, level_shift - PAGE_SHIFT, 0); + if ( page ) + { + pte = mfn_to_p2m_entry(page_to_mfn(page), mattr, t); + if ( level < 3 ) + pte.p2m.table = 0; + p2m_write_pte(entry, pte, flush_cache); + p2m->stats.mappings[level]++; + + *addr += level_size; + *maddr += level_size; + + return P2M_ONE_PROGRESS; + } + else if ( level == 3 ) + return -ENOMEM; + } + + /* L3 is always suitably aligned for mapping (handled, above) */ + BUG_ON(level == 3); + + /* + * If we get here then we failed to allocate a sufficiently + * large contiguous region for this level (which can't be + * L3). Create a page table and continue to descend so we try + * smaller allocations. + */ + rc = p2m_create_table(d, entry, 0, flush_cache); + if ( rc < 0 ) + return rc; + + return P2M_ONE_DESCEND; + + case INSERT: + if ( is_mapping_aligned(*addr, end_gpaddr, *maddr, level_size) && + /* We do not handle replacing an existing table with a superpage */ + (level == 3 || !p2m_table(orig_pte)) ) + { + /* New mapping is superpage aligned, make it */ + pte = mfn_to_p2m_entry(*maddr >> PAGE_SHIFT, mattr, t); + if ( level < 3 ) + pte.p2m.table = 0; /* Superpage entry */ + + p2m_write_pte(entry, pte, flush_cache); + + *flush |= p2m_valid(orig_pte); + + *addr += level_size; + *maddr += level_size; + + if ( p2m_valid(orig_pte) ) + { + /* + * We can't currently get here for an existing table + * mapping, since we don't handle replacing an + * existing table with a superpage. If we did we would + * need to handle freeing (and accounting) for the bit + * of the p2m tree which we would be about to lop off. + */ + BUG_ON(level < 3 && p2m_table(orig_pte)); + if ( level == 3 ) + p2m_put_l3_page(orig_pte); + } + else /* New mapping */ + p2m->stats.mappings[level]++; + + return P2M_ONE_PROGRESS; + } + else + { + /* New mapping is not superpage aligned, create a new table entry */ + + /* L3 is always suitably aligned for mapping (handled, above) */ + BUG_ON(level == 3); + + /* Not present -> create table entry and descend */ + if ( !p2m_valid(orig_pte) ) + { + rc = p2m_create_table(d, entry, 0, flush_cache); + if ( rc < 0 ) + return rc; + return P2M_ONE_DESCEND; + } + + /* Existing superpage mapping -> shatter and descend */ + if ( p2m_mapping(orig_pte) ) + { + *flush = true; + rc = p2m_create_table(d, entry, + level_shift - PAGE_SHIFT, flush_cache); + if ( rc < 0 ) + return rc; + + p2m->stats.shattered[level]++; + p2m->stats.mappings[level]--; + p2m->stats.mappings[level+1] += LPAE_ENTRIES; + } /* else: an existing table mapping -> descend */ + + BUG_ON(!p2m_table(*entry)); + + return P2M_ONE_DESCEND; + } + + break; + + case RELINQUISH: + case REMOVE: + if ( !p2m_valid(orig_pte) ) + { + /* Progress up to next boundary */ + *addr = (*addr + level_size) & level_mask; + return P2M_ONE_PROGRESS_NOP; + } + + if ( level < 3 && p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + *flush = true; + + memset(&pte, 0x00, sizeof(pte)); + p2m_write_pte(entry, pte, flush_cache); + + *addr += level_size; + + p2m->stats.mappings[level]--; + + if ( level == 3 ) + p2m_put_l3_page(orig_pte); + + /* + * This is still a single pte write, no matter the level, so no need to + * scale. + */ + return P2M_ONE_PROGRESS; + + case CACHEFLUSH: + if ( !p2m_valid(orig_pte) ) + { + *addr = (*addr + level_size) & level_mask; + return P2M_ONE_PROGRESS_NOP; + } + + if ( level < 3 && p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + /* + * could flush up to the next superpage boundary, but would + * need to be careful about preemption, so just do one 4K page + * now and return P2M_ONE_PROGRESS{,_NOP} so that the caller will + * continue to loop over the rest of the range. + */ + if ( p2m_is_ram(orig_pte.p2m.type) ) + { + unsigned long offset = paddr_to_pfn(*addr & ~level_mask); + flush_page_to_ram(orig_pte.p2m.base + offset); + + *addr += PAGE_SIZE; + return P2M_ONE_PROGRESS; + } + else + { + *addr += PAGE_SIZE; + return P2M_ONE_PROGRESS_NOP; + } + } + + BUG(); /* Should never get here */ +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -349,7 +668,7 @@ static int apply_p2m_changes(struct domain *d, int mattr, p2m_type_t t) { - int rc; + int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *first = NULL, *second = NULL, *third = NULL; paddr_t addr; @@ -357,9 +676,7 @@ static int apply_p2m_changes(struct domain *d, cur_first_offset = ~0, cur_second_offset = ~0; unsigned long count = 0; - unsigned int flush = 0; - bool_t populate = (op == INSERT || op == ALLOCATE); - lpae_t pte; + bool_t flush = false; bool_t flush_pt; /* Some IOMMU don't support coherent PT walk. When the p2m is @@ -373,6 +690,25 @@ static int apply_p2m_changes(struct domain *d, addr = start_gpaddr; while ( addr < end_gpaddr ) { + /* + * Arbitrarily, preempt every 512 operations or 8192 nops. + * 512*P2M_ONE_PROGRESS == 8192*P2M_ONE_PROGRESS_NOP == 0x2000 + * + * count is initialised to 0 above, so we are guaranteed to + * always make at least one pass. + */ + + if ( op == RELINQUISH && count >= 0x2000 ) + { + if ( hypercall_preempt_check() ) + { + p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; + rc = -ERESTART; + goto out; + } + count = 0; + } + if ( cur_first_page != p2m_first_level_index(addr) ) { if ( first ) unmap_domain_page(first); @@ -385,22 +721,18 @@ static int apply_p2m_changes(struct domain *d, cur_first_page = p2m_first_level_index(addr); } - if ( !p2m_valid(first[first_table_offset(addr)]) ) - { - if ( !populate ) - { - addr = (addr + FIRST_SIZE) & FIRST_MASK; - continue; - } + /* We only use a 3 level p2m at the moment, so no level 0, + * current hardware doesn't support super page mappings at + * level 0 anyway */ - rc = p2m_create_table(d, &first[first_table_offset(addr)], - flush_pt); - if ( rc < 0 ) - { - printk("p2m_populate_ram: L1 failed\n"); - goto out; - } - } + ret = apply_one_level(d, &first[first_table_offset(addr)], + 1, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + if ( ret != P2M_ONE_DESCEND ) continue; BUG_ON(!p2m_valid(first[first_table_offset(addr)])); @@ -412,23 +744,16 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ - if ( !p2m_valid(second[second_table_offset(addr)]) ) - { - if ( !populate ) - { - addr = (addr + SECOND_SIZE) & SECOND_MASK; - continue; - } - - rc = p2m_create_table(d, &second[second_table_offset(addr)], - flush_pt); - if ( rc < 0 ) { - printk("p2m_populate_ram: L2 failed\n"); - goto out; - } - } + ret = apply_one_level(d,&second[second_table_offset(addr)], + 2, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + if ( ret != P2M_ONE_DESCEND ) continue; - BUG_ON(!second[second_table_offset(addr)].p2m.valid); + BUG_ON(!p2m_valid(second[second_table_offset(addr)])); if ( cur_second_offset != second_table_offset(addr) ) { @@ -438,84 +763,15 @@ static int apply_p2m_changes(struct domain *d, cur_second_offset = second_table_offset(addr); } - pte = third[third_table_offset(addr)]; - - flush |= pte.p2m.valid; - - switch (op) { - case ALLOCATE: - { - /* Allocate a new RAM page and attach */ - struct page_info *page; - - ASSERT(!pte.p2m.valid); - rc = -ENOMEM; - page = alloc_domheap_page(d, 0); - if ( page == NULL ) { - printk("p2m_populate_ram: failed to allocate page\n"); - goto out; - } - - pte = mfn_to_p2m_entry(page_to_mfn(page), mattr, t); - - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - } - break; - case INSERT: - { - if ( pte.p2m.valid ) - p2m_put_page(pte); - pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr, t); - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - maddr += PAGE_SIZE; - } - break; - case RELINQUISH: - case REMOVE: - { - if ( !pte.p2m.valid ) - { - count++; - break; - } - - p2m_put_page(pte); - - count += 0x10; - - memset(&pte, 0x00, sizeof(pte)); - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - count++; - } - break; - - case CACHEFLUSH: - { - if ( !pte.p2m.valid || !p2m_is_ram(pte.p2m.type) ) - break; - - flush_page_to_ram(pte.p2m.base); - } - break; - } - - /* Preempt every 2MiB (mapped) or 32 MiB (unmapped) - arbitrary */ - if ( op == RELINQUISH && count >= 0x2000 ) - { - if ( hypercall_preempt_check() ) - { - p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; - rc = -ERESTART; - goto out; - } - count = 0; - } - - /* Got the next page */ - addr += PAGE_SIZE; + ret = apply_one_level(d, &third[third_table_offset(addr)], + 3, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + /* L3 had better have done something! We cannot descend any further */ + BUG_ON(ret == P2M_ONE_DESCEND); + count += ret; } if ( flush ) diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 911d32d..327a79d 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -29,6 +29,15 @@ struct p2m_domain { * resume the search. Apart from during teardown this can only * decrease. */ unsigned long lowest_mapped_gfn; + + /* Gather some statistics for information purposes only */ + struct { + /* Number of mappings at each p2m tree level */ + unsigned long mappings[4]; + /* Number of times we have shattered a mapping + * at each p2m tree level. */ + unsigned long shattered[4]; + } stats; }; /* List of possible type for each page in the p2m entry. @@ -79,6 +88,9 @@ int p2m_alloc_table(struct domain *d); void p2m_save_state(struct vcpu *p); void p2m_restore_state(struct vcpu *n); +/* Print debugging/statistial info about a domain's p2m */ +void p2m_dump_info(struct domain *d); + /* Look up the MFN corresponding to a domain's PFN. */ paddr_t p2m_lookup(struct domain *d, paddr_t gpfn, p2m_type_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 Sun Jul 13 19:26:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PPw-0006ZX-EY; Sun, 13 Jul 2014 19:26:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPu-0006ZC-Ly for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:35 +0000 Received: from [85.158.143.35:28990] by server-1.bemta-4.messagelabs.com id D0/91-30046-96DD2C35; Sun, 13 Jul 2014 19:26:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1405279589!17360325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1841 invoked from network); 13 Jul 2014 19:26:30 -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; 13 Jul 2014 19:26:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPp-0003YY-Fm for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPp-0008BJ-EO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:29 +0000 Date: Sun, 13 Jul 2014 19:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use superpages in p2m when pages are suitably aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5df01f6e2653ba38b3c55ef137dfc83fb99fad70 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:45 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:36:24 2014 +0100 xen: arm: use superpages in p2m when pages are suitably aligned This creates superpage (1G and 2M) mappings in the p2m for both domU and dom0 when the guest and machine addresses are suitably aligned. This relies on the domain builder to allocate suitably sized regions, this is trivially true for 1:1 mapped dom0's and was arranged for guests in a previous patch. A non-1:1 dom0's memory is not currently deliberately aligned. Since ARM pagetables are (mostly) consistent at each level this is implemented by refactoring the handling of a single level of pagetable into a common function. The two inconsistencies are that there are no superpage mappings at level zero and that level three entry mappings must set the table bit. When inserting new mappings the code shatters superpage mappings as necessary, but currently makes no attempt to coalesce anything again. In particular when inserting a mapping which could be a superpage over an existing table mapping we do not attempt to free that lower page table and instead descend into it. Some p2m statistics are added to keep track of the number of each level of mapping and the number of times we've had to shatter an existing mapping. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 1 + xen/arch/arm/p2m.c | 498 ++++++++++++++++++++++++++++++++++----------- xen/include/asm-arm/p2m.h | 12 + 3 files changed, 390 insertions(+), 121 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 0c16f23..87902ef 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -761,6 +761,7 @@ int domain_relinquish_resources(struct domain *d) void arch_dump_domain_info(struct domain *d) { + p2m_dump_info(d); } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index cb22e9c..c0c011a 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -25,12 +26,26 @@ static bool_t p2m_table(lpae_t pte) { return p2m_valid(pte) && pte.p2m.table; } -#if 0 static bool_t p2m_mapping(lpae_t pte) { return p2m_valid(pte) && !pte.p2m.table; } -#endif + +void p2m_dump_info(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + spin_lock(&p2m->lock); + printk("p2m mappings for domain %d (vmid %d):\n", + d->domain_id, p2m->vmid); + BUG_ON(p2m->stats.mappings[0] || p2m->stats.shattered[0]); + printk(" 1G mappings: %ld (shattered %ld)\n", + p2m->stats.mappings[1], p2m->stats.shattered[1]); + printk(" 2M mappings: %ld (shattered %ld)\n", + p2m->stats.mappings[2], p2m->stats.shattered[2]); + printk(" 4K mappings: %ld\n", p2m->stats.mappings[3]); + spin_unlock(&p2m->lock); +} void dump_p2m_lookup(struct domain *d, paddr_t addr) { @@ -287,15 +302,26 @@ static inline void p2m_write_pte(lpae_t *p, lpae_t pte, bool_t flush_cache) clean_xen_dcache(*p); } -/* Allocate a new page table page and hook it in via the given entry */ -static int p2m_create_table(struct domain *d, lpae_t *entry, bool_t flush_cache) +/* + * Allocate a new page table page and hook it in via the given entry. + * apply_one_level relies on this returning 0 on success + * and -ve on failure. + * + * If the existing entry is present then it must be a mapping and not + * a table and it will be shattered into the next level down. + * + * level_shift is the number of bits at the level we want to create. + */ +static int p2m_create_table(struct domain *d, lpae_t *entry, + int level_shift, bool_t flush_cache) { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; - void *p; + lpae_t *p; lpae_t pte; + int splitting = p2m_valid(*entry); - BUG_ON(entry->p2m.valid); + BUG_ON(p2m_table(*entry)); page = alloc_domheap_page(NULL, 0); if ( page == NULL ) @@ -304,9 +330,37 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, bool_t flush_cache) page_list_add(page, &p2m->pages); p = __map_domain_page(page); - clear_page(p); + if ( splitting ) + { + p2m_type_t t = entry->p2m.type; + unsigned long base_pfn = entry->p2m.base; + int i; + + /* + * We are either splitting a first level 1G page into 512 second level + * 2M pages, or a second level 2M page into 512 third level 4K pages. + */ + for ( i=0 ; i < LPAE_ENTRIES; i++ ) + { + pte = mfn_to_p2m_entry(base_pfn + (i<<(level_shift-LPAE_SHIFT)), + MATTR_MEM, t); + + /* + * First and second level super pages set p2m.table = 0, but + * third level entries set table = 1. + */ + if ( level_shift - LPAE_SHIFT ) + pte.p2m.table = 0; + + write_pte(&p[i], pte); + } + } + else + clear_page(p); + if ( flush_cache ) clean_xen_dcache_va_range(p, PAGE_SIZE); + unmap_domain_page(p); pte = mfn_to_p2m_entry(page_to_mfn(page), MATTR_MEM, p2m_invalid); @@ -324,8 +378,14 @@ enum p2m_operation { CACHEFLUSH, }; -static void p2m_put_page(const lpae_t pte) +/* Put any references on the single 4K page referenced by pte. TODO: + * Handle superpages, for now we only take special references for leaf + * pages (specifically foreign ones, which can't be super mapped today). + */ +static void p2m_put_l3_page(const lpae_t pte) { + ASSERT(p2m_valid(pte)); + /* TODO: Handle other p2m types * * It's safe to do the put_page here because page_alloc will @@ -341,6 +401,265 @@ static void p2m_put_page(const lpae_t pte) } } +/* + * Returns true if start_gpaddr..end_gpaddr contains at least one + * suitably aligned level_size mappping of maddr. + * + * So long as the range is large enough the end_gpaddr need not be + * aligned (callers should create one superpage mapping based on this + * result and then call this again on the new range, eventually the + * slop at the end will cause this function to return false). + */ +static bool_t is_mapping_aligned(const paddr_t start_gpaddr, + const paddr_t end_gpaddr, + const paddr_t maddr, + const paddr_t level_size) +{ + const paddr_t level_mask = level_size - 1; + + /* No hardware superpages at level 0 */ + if ( level_size == ZEROETH_SIZE ) + return false; + + /* + * A range smaller than the size of a superpage at this level + * cannot be superpage aligned. + */ + if ( ( end_gpaddr - start_gpaddr ) < level_size - 1 ) + return false; + + /* Both the gpaddr and maddr must be aligned */ + if ( start_gpaddr & level_mask ) + return false; + if ( maddr & level_mask ) + return false; + return true; +} + +#define P2M_ONE_DESCEND 0 +#define P2M_ONE_PROGRESS_NOP 0x1 +#define P2M_ONE_PROGRESS 0x10 + +/* + * 0 == (P2M_ONE_DESCEND) continue to descend the tree + * +ve == (P2M_ONE_PROGRESS_*) handled at this level, continue, flush, + * entry, addr and maddr updated. Return value is an + * indication of the amount of work done (for preemption). + * -ve == (-Exxx) error. + */ +static int apply_one_level(struct domain *d, + lpae_t *entry, + unsigned int level, + bool_t flush_cache, + enum p2m_operation op, + paddr_t start_gpaddr, + paddr_t end_gpaddr, + paddr_t *addr, + paddr_t *maddr, + bool_t *flush, + int mattr, + p2m_type_t t) +{ + /* Helpers to lookup the properties of each level */ + const paddr_t level_sizes[] = + { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; + const paddr_t level_masks[] = + { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; + const paddr_t level_shifts[] = + { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; + const paddr_t level_size = level_sizes[level]; + const paddr_t level_mask = level_masks[level]; + const paddr_t level_shift = level_shifts[level]; + + struct p2m_domain *p2m = &d->arch.p2m; + lpae_t pte; + const lpae_t orig_pte = *entry; + int rc; + + BUG_ON(level > 3); + + switch ( op ) + { + case ALLOCATE: + ASSERT(level < 3 || !p2m_valid(orig_pte)); + ASSERT(*maddr == 0); + + if ( p2m_valid(orig_pte) ) + return P2M_ONE_DESCEND; + + if ( is_mapping_aligned(*addr, end_gpaddr, 0, level_size) ) + { + struct page_info *page; + + page = alloc_domheap_pages(d, level_shift - PAGE_SHIFT, 0); + if ( page ) + { + pte = mfn_to_p2m_entry(page_to_mfn(page), mattr, t); + if ( level < 3 ) + pte.p2m.table = 0; + p2m_write_pte(entry, pte, flush_cache); + p2m->stats.mappings[level]++; + + *addr += level_size; + *maddr += level_size; + + return P2M_ONE_PROGRESS; + } + else if ( level == 3 ) + return -ENOMEM; + } + + /* L3 is always suitably aligned for mapping (handled, above) */ + BUG_ON(level == 3); + + /* + * If we get here then we failed to allocate a sufficiently + * large contiguous region for this level (which can't be + * L3). Create a page table and continue to descend so we try + * smaller allocations. + */ + rc = p2m_create_table(d, entry, 0, flush_cache); + if ( rc < 0 ) + return rc; + + return P2M_ONE_DESCEND; + + case INSERT: + if ( is_mapping_aligned(*addr, end_gpaddr, *maddr, level_size) && + /* We do not handle replacing an existing table with a superpage */ + (level == 3 || !p2m_table(orig_pte)) ) + { + /* New mapping is superpage aligned, make it */ + pte = mfn_to_p2m_entry(*maddr >> PAGE_SHIFT, mattr, t); + if ( level < 3 ) + pte.p2m.table = 0; /* Superpage entry */ + + p2m_write_pte(entry, pte, flush_cache); + + *flush |= p2m_valid(orig_pte); + + *addr += level_size; + *maddr += level_size; + + if ( p2m_valid(orig_pte) ) + { + /* + * We can't currently get here for an existing table + * mapping, since we don't handle replacing an + * existing table with a superpage. If we did we would + * need to handle freeing (and accounting) for the bit + * of the p2m tree which we would be about to lop off. + */ + BUG_ON(level < 3 && p2m_table(orig_pte)); + if ( level == 3 ) + p2m_put_l3_page(orig_pte); + } + else /* New mapping */ + p2m->stats.mappings[level]++; + + return P2M_ONE_PROGRESS; + } + else + { + /* New mapping is not superpage aligned, create a new table entry */ + + /* L3 is always suitably aligned for mapping (handled, above) */ + BUG_ON(level == 3); + + /* Not present -> create table entry and descend */ + if ( !p2m_valid(orig_pte) ) + { + rc = p2m_create_table(d, entry, 0, flush_cache); + if ( rc < 0 ) + return rc; + return P2M_ONE_DESCEND; + } + + /* Existing superpage mapping -> shatter and descend */ + if ( p2m_mapping(orig_pte) ) + { + *flush = true; + rc = p2m_create_table(d, entry, + level_shift - PAGE_SHIFT, flush_cache); + if ( rc < 0 ) + return rc; + + p2m->stats.shattered[level]++; + p2m->stats.mappings[level]--; + p2m->stats.mappings[level+1] += LPAE_ENTRIES; + } /* else: an existing table mapping -> descend */ + + BUG_ON(!p2m_table(*entry)); + + return P2M_ONE_DESCEND; + } + + break; + + case RELINQUISH: + case REMOVE: + if ( !p2m_valid(orig_pte) ) + { + /* Progress up to next boundary */ + *addr = (*addr + level_size) & level_mask; + return P2M_ONE_PROGRESS_NOP; + } + + if ( level < 3 && p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + *flush = true; + + memset(&pte, 0x00, sizeof(pte)); + p2m_write_pte(entry, pte, flush_cache); + + *addr += level_size; + + p2m->stats.mappings[level]--; + + if ( level == 3 ) + p2m_put_l3_page(orig_pte); + + /* + * This is still a single pte write, no matter the level, so no need to + * scale. + */ + return P2M_ONE_PROGRESS; + + case CACHEFLUSH: + if ( !p2m_valid(orig_pte) ) + { + *addr = (*addr + level_size) & level_mask; + return P2M_ONE_PROGRESS_NOP; + } + + if ( level < 3 && p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + /* + * could flush up to the next superpage boundary, but would + * need to be careful about preemption, so just do one 4K page + * now and return P2M_ONE_PROGRESS{,_NOP} so that the caller will + * continue to loop over the rest of the range. + */ + if ( p2m_is_ram(orig_pte.p2m.type) ) + { + unsigned long offset = paddr_to_pfn(*addr & ~level_mask); + flush_page_to_ram(orig_pte.p2m.base + offset); + + *addr += PAGE_SIZE; + return P2M_ONE_PROGRESS; + } + else + { + *addr += PAGE_SIZE; + return P2M_ONE_PROGRESS_NOP; + } + } + + BUG(); /* Should never get here */ +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -349,7 +668,7 @@ static int apply_p2m_changes(struct domain *d, int mattr, p2m_type_t t) { - int rc; + int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *first = NULL, *second = NULL, *third = NULL; paddr_t addr; @@ -357,9 +676,7 @@ static int apply_p2m_changes(struct domain *d, cur_first_offset = ~0, cur_second_offset = ~0; unsigned long count = 0; - unsigned int flush = 0; - bool_t populate = (op == INSERT || op == ALLOCATE); - lpae_t pte; + bool_t flush = false; bool_t flush_pt; /* Some IOMMU don't support coherent PT walk. When the p2m is @@ -373,6 +690,25 @@ static int apply_p2m_changes(struct domain *d, addr = start_gpaddr; while ( addr < end_gpaddr ) { + /* + * Arbitrarily, preempt every 512 operations or 8192 nops. + * 512*P2M_ONE_PROGRESS == 8192*P2M_ONE_PROGRESS_NOP == 0x2000 + * + * count is initialised to 0 above, so we are guaranteed to + * always make at least one pass. + */ + + if ( op == RELINQUISH && count >= 0x2000 ) + { + if ( hypercall_preempt_check() ) + { + p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; + rc = -ERESTART; + goto out; + } + count = 0; + } + if ( cur_first_page != p2m_first_level_index(addr) ) { if ( first ) unmap_domain_page(first); @@ -385,22 +721,18 @@ static int apply_p2m_changes(struct domain *d, cur_first_page = p2m_first_level_index(addr); } - if ( !p2m_valid(first[first_table_offset(addr)]) ) - { - if ( !populate ) - { - addr = (addr + FIRST_SIZE) & FIRST_MASK; - continue; - } + /* We only use a 3 level p2m at the moment, so no level 0, + * current hardware doesn't support super page mappings at + * level 0 anyway */ - rc = p2m_create_table(d, &first[first_table_offset(addr)], - flush_pt); - if ( rc < 0 ) - { - printk("p2m_populate_ram: L1 failed\n"); - goto out; - } - } + ret = apply_one_level(d, &first[first_table_offset(addr)], + 1, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + if ( ret != P2M_ONE_DESCEND ) continue; BUG_ON(!p2m_valid(first[first_table_offset(addr)])); @@ -412,23 +744,16 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ - if ( !p2m_valid(second[second_table_offset(addr)]) ) - { - if ( !populate ) - { - addr = (addr + SECOND_SIZE) & SECOND_MASK; - continue; - } - - rc = p2m_create_table(d, &second[second_table_offset(addr)], - flush_pt); - if ( rc < 0 ) { - printk("p2m_populate_ram: L2 failed\n"); - goto out; - } - } + ret = apply_one_level(d,&second[second_table_offset(addr)], + 2, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + if ( ret != P2M_ONE_DESCEND ) continue; - BUG_ON(!second[second_table_offset(addr)].p2m.valid); + BUG_ON(!p2m_valid(second[second_table_offset(addr)])); if ( cur_second_offset != second_table_offset(addr) ) { @@ -438,84 +763,15 @@ static int apply_p2m_changes(struct domain *d, cur_second_offset = second_table_offset(addr); } - pte = third[third_table_offset(addr)]; - - flush |= pte.p2m.valid; - - switch (op) { - case ALLOCATE: - { - /* Allocate a new RAM page and attach */ - struct page_info *page; - - ASSERT(!pte.p2m.valid); - rc = -ENOMEM; - page = alloc_domheap_page(d, 0); - if ( page == NULL ) { - printk("p2m_populate_ram: failed to allocate page\n"); - goto out; - } - - pte = mfn_to_p2m_entry(page_to_mfn(page), mattr, t); - - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - } - break; - case INSERT: - { - if ( pte.p2m.valid ) - p2m_put_page(pte); - pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr, t); - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - maddr += PAGE_SIZE; - } - break; - case RELINQUISH: - case REMOVE: - { - if ( !pte.p2m.valid ) - { - count++; - break; - } - - p2m_put_page(pte); - - count += 0x10; - - memset(&pte, 0x00, sizeof(pte)); - p2m_write_pte(&third[third_table_offset(addr)], - pte, flush_pt); - count++; - } - break; - - case CACHEFLUSH: - { - if ( !pte.p2m.valid || !p2m_is_ram(pte.p2m.type) ) - break; - - flush_page_to_ram(pte.p2m.base); - } - break; - } - - /* Preempt every 2MiB (mapped) or 32 MiB (unmapped) - arbitrary */ - if ( op == RELINQUISH && count >= 0x2000 ) - { - if ( hypercall_preempt_check() ) - { - p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; - rc = -ERESTART; - goto out; - } - count = 0; - } - - /* Got the next page */ - addr += PAGE_SIZE; + ret = apply_one_level(d, &third[third_table_offset(addr)], + 3, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + /* L3 had better have done something! We cannot descend any further */ + BUG_ON(ret == P2M_ONE_DESCEND); + count += ret; } if ( flush ) diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 911d32d..327a79d 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -29,6 +29,15 @@ struct p2m_domain { * resume the search. Apart from during teardown this can only * decrease. */ unsigned long lowest_mapped_gfn; + + /* Gather some statistics for information purposes only */ + struct { + /* Number of mappings at each p2m tree level */ + unsigned long mappings[4]; + /* Number of times we have shattered a mapping + * at each p2m tree level. */ + unsigned long shattered[4]; + } stats; }; /* List of possible type for each page in the p2m entry. @@ -79,6 +88,9 @@ int p2m_alloc_table(struct domain *d); void p2m_save_state(struct vcpu *p); void p2m_restore_state(struct vcpu *n); +/* Print debugging/statistial info about a domain's p2m */ +void p2m_dump_info(struct domain *d); + /* Look up the MFN corresponding to a domain's PFN. */ paddr_t p2m_lookup(struct domain *d, paddr_t gpfn, p2m_type_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 Sun Jul 13 19:26:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ6-0006b3-HO; Sun, 13 Jul 2014 19:26:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ5-0006al-BO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:45 +0000 Received: from [85.158.143.35:29303] by server-3.bemta-4.messagelabs.com id CC/14-09960-47DD2C35; Sun, 13 Jul 2014 19:26:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279599!10138824!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18380 invoked from network); 13 Jul 2014 19:26:40 -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; 13 Jul 2014 19:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPz-0003Ye-Ki for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPz-0008Bl-Jf for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:39 +0000 Date: Sun, 13 Jul 2014 19:26:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: allocate more than one bank for 1:1 domain 0 if needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90447d7f1f4e02490c3808f019a90742f7a3de89 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:46 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:36:51 2014 +0100 xen: arm: allocate more than one bank for 1:1 domain 0 if needed Depending on where Xen and the initial modules were loaded into RAM we may not be able to allocate a suitably contiguous block of memory for dom0. Especially since the allocations made by alloc_domheap_pages are naturally aligned (e.g. a 1GB allocation must be at a 1GB boundary). The alignment requirement in particular is a huge limitation, meaning that even dom0_mem0=1G on a 2GB system is pretty likely to fail unless you are very careful with your load addresses. People were also having trouble with dom0 > 128MB on the 1GB cubieboard2 when using fairly standard load addresses for things. This patch tries to allocate multiple banks of memory in order to try and satisfy the entire requested domain 0 allocation. Sadly this turns out to be pretty tricky to arrange (see the large comment in the code). Signed-off-by: Ian Campbell Cc: Karim Raslan Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 288 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 266 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8c850ca..69188a4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -45,6 +45,13 @@ custom_param("dom0_mem", parse_dom0_mem); # define DPRINT(fmt, args...) do {} while ( 0 ) #endif +//#define DEBUG_11_ALLOCATION +#ifdef DEBUG_11_ALLOCATION +# define D11PRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) +#else +# define D11PRINT(fmt, args...) do {} while ( 0 ) +#endif + /* * Amount of extra space required to dom0's device tree. No new nodes * are added (yet) but one terminating reserve map entry (16 bytes) is @@ -67,39 +74,276 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) return alloc_vcpu(dom0, 0, 0); } -static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) +static unsigned int get_11_allocation_size(paddr_t size) { - paddr_t start; - paddr_t size; - struct page_info *pg; - unsigned int order = get_order_from_bytes(dom0_mem); - int res; - paddr_t spfn; + /* + * get_order_from_bytes returns the order greater than or equal to + * the given size, but we need less than or equal. Adding one to + * the size pushes an evenly aligned size into the next order, so + * we can then unconditionally subtract 1 from the order which is + * returned. + */ + return get_order_from_bytes(size + 1) - 1; +} - if ( is_32bit_domain(d) ) - pg = alloc_domheap_pages(d, order, MEMF_bits(32)); - else - pg = alloc_domheap_pages(d, order, 0); - if ( !pg ) - panic("Failed to allocate contiguous memory for dom0"); +/* + * Insert the given pages into a memory bank, banks are ordered by address. + * + * Returns false if the memory would be below bank 0 or we have run + * out of banks. In this case it will free the pages. + */ +static bool_t insert_11_bank(struct domain *d, + struct kernel_info *kinfo, + struct page_info *pg, + unsigned int order) +{ + int res, i; + paddr_t spfn; + paddr_t start, size; spfn = page_to_mfn(pg); start = pfn_to_paddr(spfn); size = pfn_to_paddr((1 << order)); - // 1:1 mapping - printk("Populate P2M %#"PRIx64"->%#"PRIx64" (1:1 mapping for dom0)\n", - start, start + size); - res = guest_physmap_add_page(d, spfn, spfn, order); + D11PRINT("Allocated %#"PRIpaddr"-%#"PRIpaddr" (%ldMB/%ldMB, order %d)\n", + start, start + size, + 1UL << (order+PAGE_SHIFT-20), + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20), + order); - if ( res ) - panic("Unable to add pages in DOM0: %d", res); + if ( kinfo->mem.nr_banks > 0 && + size < MB(128) && + start + size < kinfo->mem.bank[0].start ) + { + D11PRINT("Allocation below bank 0 is too small, not using\n"); + goto fail; + } - kinfo->mem.bank[0].start = start; - kinfo->mem.bank[0].size = size; - kinfo->mem.nr_banks = 1; + res = guest_physmap_add_page(d, spfn, spfn, order); + if ( res ) + panic("Failed map pages to DOM0: %d", res); kinfo->unassigned_mem -= size; + + if ( kinfo->mem.nr_banks == 0 ) + { + kinfo->mem.bank[0].start = start; + kinfo->mem.bank[0].size = size; + kinfo->mem.nr_banks = 1; + return true; + } + + for( i = 0; i < kinfo->mem.nr_banks; i++ ) + { + struct membank *bank = &kinfo->mem.bank[i]; + + /* If possible merge new memory into the start of the bank */ + if ( bank->start == start+size ) + { + bank->start = start; + bank->size += size; + return true; + } + + /* If possible merge new memory onto the end of the bank */ + if ( start == bank->start + bank->size ) + { + bank->size += size; + return true; + } + + /* + * Otherwise if it is below this bank insert new memory in a + * new bank before this one. If there was a lower bank we + * could have inserted the memory into/before we would already + * have done so, so this must be the right place. + */ + if ( start + size < bank->start && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + memmove(bank + 1, bank, sizeof(*bank)*(kinfo->mem.nr_banks - i)); + kinfo->mem.nr_banks++; + bank->start = start; + bank->size = size; + return true; + } + } + + if ( i == kinfo->mem.nr_banks && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + struct membank *bank = &kinfo->mem.bank[kinfo->mem.nr_banks]; + + bank->start = start; + bank->size = size; + kinfo->mem.nr_banks++; + return true; + } + + /* If we get here then there are no more banks to fill. */ + +fail: + free_domheap_pages(pg, order); + return false; +} + +/* + * This is all pretty horrible. + * + * Requirements: + * + * 1. The dom0 kernel should be loaded within the first 128MB of RAM. This + * is necessary at least for Linux zImage kernels, which are all we + * support today. + * 2. We want to put the dom0 kernel, ramdisk and DTB in the same + * bank. Partly this is just easier for us to deal with, but also + * the ramdisk and DTB must be placed within a certain proximity of + * the kernel within RAM. + * 3. For 32-bit dom0 we want to place as much of the RAM as we + * reasonably can below 4GB, so that it can be used by non-LPAE + * enabled kernels. + * 4. For 32-bit dom0 the kernel must be located below 4GB. + * 5. We want to have a few largers banks rather than many smaller ones. + * + * For the first two requirements we need to make sure that the lowest + * bank is sufficiently large. + * + * For convenience we also sort the banks by physical address. + * + * The memory allocator does not really give us the flexibility to + * meet these requirements directly. So instead of proceed as follows: + * + * We first allocate the largest allocation we can as low as we + * can. This then becomes the first bank. This bank must be at least + * 128MB (or dom0_mem if that is smaller). + * + * Then we start allocating more memory, trying to allocate the + * largest possible size and trying smaller sizes until we + * successfully allocate something. + * + * We then try and insert this memory in to the list of banks. If it + * can be merged into an existing bank then this is trivial. + * + * If the new memory is before the first bank (and cannot be merged into it) + * and is at least 128M then we allow it, otherwise we give up. Since the + * allocator prefers to allocate high addresses first and the first bank has + * already been allocated to be as low as possible this likely means we + * wouldn't have been able to allocate much more memory anyway. + * + * Otherwise we insert a new bank. If we've reached MAX_NR_BANKS then + * we give up. + * + * For 32-bit domain we require that the initial allocation for the + * first bank is under 4G. Then for the subsequent allocations we + * initially allocate memory only from below 4GB. Once that runs out + * (as described above) we allow higher allocations and continue until + * that runs out (or we have allocated sufficient dom0 memory). + */ +static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) +{ + const unsigned int min_low_order = + get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); + const unsigned int min_order = get_order_from_bytes(MB(4)); + struct page_info *pg; + unsigned int order = get_11_allocation_size(kinfo->unassigned_mem); + int i; + + bool_t lowmem = is_32bit_domain(d); + unsigned int bits; + + printk("Allocating 1:1 mappings totalling %ldMB for dom0:\n", + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20)); + + kinfo->mem.nr_banks = 0; + + /* + * First try and allocate the largest thing we can as low as + * possible to be bank 0. + */ + while ( order >= min_low_order ) + { + for ( bits = order ; bits <= (lowmem ? 32 : PADDR_BITS); bits++ ) + { + pg = alloc_domheap_pages(d, order, MEMF_bits(bits)); + if ( pg != NULL ) + goto got_bank0; + } + order--; + } + + panic("Unable to allocate first memory bank"); + + got_bank0: + + if ( !insert_11_bank(d, kinfo, pg, order) ) + BUG(); /* Cannot fail for first bank */ + + /* Now allocate more memory and fill in additional banks */ + + order = get_11_allocation_size(kinfo->unassigned_mem); + while ( kinfo->unassigned_mem && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + pg = alloc_domheap_pages(d, order, lowmem ? MEMF_bits(32) : 0); + if ( !pg ) + { + order --; + + if ( lowmem && order < min_low_order) + { + D11PRINT("Failed at min_low_order, allow high allocations\n"); + order = get_11_allocation_size(kinfo->unassigned_mem); + lowmem = false; + continue; + } + if ( order >= min_order ) + continue; + + /* No more we can do */ + break; + } + + if ( !insert_11_bank(d, kinfo, pg, order) ) + { + if ( kinfo->mem.nr_banks == NR_MEM_BANKS ) + /* Nothing more we can do. */ + break; + + if ( lowmem ) + { + D11PRINT("Allocation below bank 0, allow high allocations\n"); + order = get_11_allocation_size(kinfo->unassigned_mem); + lowmem = false; + continue; + } + else + { + D11PRINT("Allocation below bank 0\n"); + break; + } + } + + /* + * Success, next time around try again to get the largest order + * allocation possible. + */ + order = get_11_allocation_size(kinfo->unassigned_mem); + } + + if ( kinfo->unassigned_mem ) + printk("WARNING: Failed to allocate requested dom0 memory." + /* Don't want format this as PRIpaddr (16 digit hex) */ + " %ldMB unallocated\n", + (unsigned long)kinfo->unassigned_mem >> 20); + + for( i = 0; i < kinfo->mem.nr_banks; i++ ) + { + printk("BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", + i, + kinfo->mem.bank[i].start, + kinfo->mem.bank[i].start + kinfo->mem.bank[i].size, + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->mem.bank[i].size >> 20)); + } } static void allocate_memory(struct domain *d, struct kernel_info *kinfo) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:26:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ6-0006b3-HO; Sun, 13 Jul 2014 19:26:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ5-0006al-BO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:45 +0000 Received: from [85.158.143.35:29303] by server-3.bemta-4.messagelabs.com id CC/14-09960-47DD2C35; Sun, 13 Jul 2014 19:26:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405279599!10138824!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18380 invoked from network); 13 Jul 2014 19:26:40 -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; 13 Jul 2014 19:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PPz-0003Ye-Ki for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PPz-0008Bl-Jf for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:39 +0000 Date: Sun, 13 Jul 2014 19:26:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: allocate more than one bank for 1:1 domain 0 if needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90447d7f1f4e02490c3808f019a90742f7a3de89 Author: Ian Campbell AuthorDate: Wed Jul 9 13:07:46 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:36:51 2014 +0100 xen: arm: allocate more than one bank for 1:1 domain 0 if needed Depending on where Xen and the initial modules were loaded into RAM we may not be able to allocate a suitably contiguous block of memory for dom0. Especially since the allocations made by alloc_domheap_pages are naturally aligned (e.g. a 1GB allocation must be at a 1GB boundary). The alignment requirement in particular is a huge limitation, meaning that even dom0_mem0=1G on a 2GB system is pretty likely to fail unless you are very careful with your load addresses. People were also having trouble with dom0 > 128MB on the 1GB cubieboard2 when using fairly standard load addresses for things. This patch tries to allocate multiple banks of memory in order to try and satisfy the entire requested domain 0 allocation. Sadly this turns out to be pretty tricky to arrange (see the large comment in the code). Signed-off-by: Ian Campbell Cc: Karim Raslan Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 288 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 266 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8c850ca..69188a4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -45,6 +45,13 @@ custom_param("dom0_mem", parse_dom0_mem); # define DPRINT(fmt, args...) do {} while ( 0 ) #endif +//#define DEBUG_11_ALLOCATION +#ifdef DEBUG_11_ALLOCATION +# define D11PRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) +#else +# define D11PRINT(fmt, args...) do {} while ( 0 ) +#endif + /* * Amount of extra space required to dom0's device tree. No new nodes * are added (yet) but one terminating reserve map entry (16 bytes) is @@ -67,39 +74,276 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) return alloc_vcpu(dom0, 0, 0); } -static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) +static unsigned int get_11_allocation_size(paddr_t size) { - paddr_t start; - paddr_t size; - struct page_info *pg; - unsigned int order = get_order_from_bytes(dom0_mem); - int res; - paddr_t spfn; + /* + * get_order_from_bytes returns the order greater than or equal to + * the given size, but we need less than or equal. Adding one to + * the size pushes an evenly aligned size into the next order, so + * we can then unconditionally subtract 1 from the order which is + * returned. + */ + return get_order_from_bytes(size + 1) - 1; +} - if ( is_32bit_domain(d) ) - pg = alloc_domheap_pages(d, order, MEMF_bits(32)); - else - pg = alloc_domheap_pages(d, order, 0); - if ( !pg ) - panic("Failed to allocate contiguous memory for dom0"); +/* + * Insert the given pages into a memory bank, banks are ordered by address. + * + * Returns false if the memory would be below bank 0 or we have run + * out of banks. In this case it will free the pages. + */ +static bool_t insert_11_bank(struct domain *d, + struct kernel_info *kinfo, + struct page_info *pg, + unsigned int order) +{ + int res, i; + paddr_t spfn; + paddr_t start, size; spfn = page_to_mfn(pg); start = pfn_to_paddr(spfn); size = pfn_to_paddr((1 << order)); - // 1:1 mapping - printk("Populate P2M %#"PRIx64"->%#"PRIx64" (1:1 mapping for dom0)\n", - start, start + size); - res = guest_physmap_add_page(d, spfn, spfn, order); + D11PRINT("Allocated %#"PRIpaddr"-%#"PRIpaddr" (%ldMB/%ldMB, order %d)\n", + start, start + size, + 1UL << (order+PAGE_SHIFT-20), + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20), + order); - if ( res ) - panic("Unable to add pages in DOM0: %d", res); + if ( kinfo->mem.nr_banks > 0 && + size < MB(128) && + start + size < kinfo->mem.bank[0].start ) + { + D11PRINT("Allocation below bank 0 is too small, not using\n"); + goto fail; + } - kinfo->mem.bank[0].start = start; - kinfo->mem.bank[0].size = size; - kinfo->mem.nr_banks = 1; + res = guest_physmap_add_page(d, spfn, spfn, order); + if ( res ) + panic("Failed map pages to DOM0: %d", res); kinfo->unassigned_mem -= size; + + if ( kinfo->mem.nr_banks == 0 ) + { + kinfo->mem.bank[0].start = start; + kinfo->mem.bank[0].size = size; + kinfo->mem.nr_banks = 1; + return true; + } + + for( i = 0; i < kinfo->mem.nr_banks; i++ ) + { + struct membank *bank = &kinfo->mem.bank[i]; + + /* If possible merge new memory into the start of the bank */ + if ( bank->start == start+size ) + { + bank->start = start; + bank->size += size; + return true; + } + + /* If possible merge new memory onto the end of the bank */ + if ( start == bank->start + bank->size ) + { + bank->size += size; + return true; + } + + /* + * Otherwise if it is below this bank insert new memory in a + * new bank before this one. If there was a lower bank we + * could have inserted the memory into/before we would already + * have done so, so this must be the right place. + */ + if ( start + size < bank->start && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + memmove(bank + 1, bank, sizeof(*bank)*(kinfo->mem.nr_banks - i)); + kinfo->mem.nr_banks++; + bank->start = start; + bank->size = size; + return true; + } + } + + if ( i == kinfo->mem.nr_banks && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + struct membank *bank = &kinfo->mem.bank[kinfo->mem.nr_banks]; + + bank->start = start; + bank->size = size; + kinfo->mem.nr_banks++; + return true; + } + + /* If we get here then there are no more banks to fill. */ + +fail: + free_domheap_pages(pg, order); + return false; +} + +/* + * This is all pretty horrible. + * + * Requirements: + * + * 1. The dom0 kernel should be loaded within the first 128MB of RAM. This + * is necessary at least for Linux zImage kernels, which are all we + * support today. + * 2. We want to put the dom0 kernel, ramdisk and DTB in the same + * bank. Partly this is just easier for us to deal with, but also + * the ramdisk and DTB must be placed within a certain proximity of + * the kernel within RAM. + * 3. For 32-bit dom0 we want to place as much of the RAM as we + * reasonably can below 4GB, so that it can be used by non-LPAE + * enabled kernels. + * 4. For 32-bit dom0 the kernel must be located below 4GB. + * 5. We want to have a few largers banks rather than many smaller ones. + * + * For the first two requirements we need to make sure that the lowest + * bank is sufficiently large. + * + * For convenience we also sort the banks by physical address. + * + * The memory allocator does not really give us the flexibility to + * meet these requirements directly. So instead of proceed as follows: + * + * We first allocate the largest allocation we can as low as we + * can. This then becomes the first bank. This bank must be at least + * 128MB (or dom0_mem if that is smaller). + * + * Then we start allocating more memory, trying to allocate the + * largest possible size and trying smaller sizes until we + * successfully allocate something. + * + * We then try and insert this memory in to the list of banks. If it + * can be merged into an existing bank then this is trivial. + * + * If the new memory is before the first bank (and cannot be merged into it) + * and is at least 128M then we allow it, otherwise we give up. Since the + * allocator prefers to allocate high addresses first and the first bank has + * already been allocated to be as low as possible this likely means we + * wouldn't have been able to allocate much more memory anyway. + * + * Otherwise we insert a new bank. If we've reached MAX_NR_BANKS then + * we give up. + * + * For 32-bit domain we require that the initial allocation for the + * first bank is under 4G. Then for the subsequent allocations we + * initially allocate memory only from below 4GB. Once that runs out + * (as described above) we allow higher allocations and continue until + * that runs out (or we have allocated sufficient dom0 memory). + */ +static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) +{ + const unsigned int min_low_order = + get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); + const unsigned int min_order = get_order_from_bytes(MB(4)); + struct page_info *pg; + unsigned int order = get_11_allocation_size(kinfo->unassigned_mem); + int i; + + bool_t lowmem = is_32bit_domain(d); + unsigned int bits; + + printk("Allocating 1:1 mappings totalling %ldMB for dom0:\n", + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20)); + + kinfo->mem.nr_banks = 0; + + /* + * First try and allocate the largest thing we can as low as + * possible to be bank 0. + */ + while ( order >= min_low_order ) + { + for ( bits = order ; bits <= (lowmem ? 32 : PADDR_BITS); bits++ ) + { + pg = alloc_domheap_pages(d, order, MEMF_bits(bits)); + if ( pg != NULL ) + goto got_bank0; + } + order--; + } + + panic("Unable to allocate first memory bank"); + + got_bank0: + + if ( !insert_11_bank(d, kinfo, pg, order) ) + BUG(); /* Cannot fail for first bank */ + + /* Now allocate more memory and fill in additional banks */ + + order = get_11_allocation_size(kinfo->unassigned_mem); + while ( kinfo->unassigned_mem && kinfo->mem.nr_banks < NR_MEM_BANKS ) + { + pg = alloc_domheap_pages(d, order, lowmem ? MEMF_bits(32) : 0); + if ( !pg ) + { + order --; + + if ( lowmem && order < min_low_order) + { + D11PRINT("Failed at min_low_order, allow high allocations\n"); + order = get_11_allocation_size(kinfo->unassigned_mem); + lowmem = false; + continue; + } + if ( order >= min_order ) + continue; + + /* No more we can do */ + break; + } + + if ( !insert_11_bank(d, kinfo, pg, order) ) + { + if ( kinfo->mem.nr_banks == NR_MEM_BANKS ) + /* Nothing more we can do. */ + break; + + if ( lowmem ) + { + D11PRINT("Allocation below bank 0, allow high allocations\n"); + order = get_11_allocation_size(kinfo->unassigned_mem); + lowmem = false; + continue; + } + else + { + D11PRINT("Allocation below bank 0\n"); + break; + } + } + + /* + * Success, next time around try again to get the largest order + * allocation possible. + */ + order = get_11_allocation_size(kinfo->unassigned_mem); + } + + if ( kinfo->unassigned_mem ) + printk("WARNING: Failed to allocate requested dom0 memory." + /* Don't want format this as PRIpaddr (16 digit hex) */ + " %ldMB unallocated\n", + (unsigned long)kinfo->unassigned_mem >> 20); + + for( i = 0; i < kinfo->mem.nr_banks; i++ ) + { + printk("BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", + i, + kinfo->mem.bank[i].start, + kinfo->mem.bank[i].start + kinfo->mem.bank[i].size, + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->mem.bank[i].size >> 20)); + } } static void allocate_memory(struct domain *d, struct kernel_info *kinfo) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:26:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PQD-0006cj-Li; Sun, 13 Jul 2014 19:26:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQC-0006cK-B3 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:52 +0000 Received: from [85.158.143.35:29517] by server-3.bemta-4.messagelabs.com id 46/24-09960-B7DD2C35; Sun, 13 Jul 2014 19:26:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405279609!17119996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25126 invoked from network); 13 Jul 2014 19:26:50 -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; 13 Jul 2014 19:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ9-0003Yo-QO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQ9-0008C9-P0 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:49 +0000 Date: Sun, 13 Jul 2014 19:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Tweak .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5edd2fff0ea79f21647f455e82b568479aee8939 Author: Andrew Cooper AuthorDate: Mon Jul 7 11:27:33 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:50:26 2014 +0100 docs: Tweak .gitignore * Remove ignores for removed docs. * Introduce blanket ignores for the "output" directories, including txt/ which was previously missing. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- .gitignore | 43 +++---------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index cf9264f..fefe13c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,48 +40,11 @@ config/Toplevel.mk build-* dist/* -docs/autom4te.cache/ -docs/config.log -docs/config.status -docs/*.aux -docs/*.dvi -docs/*.log -docs/*.pdf -docs/*.ps -docs/*.toc -docs/api/* -docs/figs/xenserver.eps -docs/html/* -docs/interface/WARNINGS -docs/interface/images.pl -docs/interface/images.tex -docs/interface/img1.png -docs/interface/index.html -docs/interface/interface.css -docs/interface/interface.html -docs/interface/labels.pl +docs/html/ docs/man1/ docs/man5/ -docs/pdf/* -docs/ps/* -docs/user/WARNINGS -docs/user/images.pl -docs/user/images.tex -docs/user/img1.png -docs/user/img2.png -docs/user/img3.png -docs/user/index.html -docs/user/internals.pl -docs/user/labels.pl -docs/user/user.css -docs/user/user.html -docs/xen-api/vm_lifecycle.eps -docs/xen-api/xenapi-datamodel-graph.eps -docs/xen-api/xenapi.out -docs/xen-api/xenapi.dvi -docs/xen-api/xenapi.pdf -docs/xen-api/xenapi.ps -docs/xen-api/xenapi.toc +docs/pdf/ +docs/txt/ extras/mini-os/include/mini-os extras/mini-os/include/x86/mini-os extras/mini-os/include/xen -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:26:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:26: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 1X6PQD-0006cj-Li; Sun, 13 Jul 2014 19:26:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQC-0006cK-B3 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:52 +0000 Received: from [85.158.143.35:29517] by server-3.bemta-4.messagelabs.com id 46/24-09960-B7DD2C35; Sun, 13 Jul 2014 19:26:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405279609!17119996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25126 invoked from network); 13 Jul 2014 19:26:50 -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; 13 Jul 2014 19:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQ9-0003Yo-QO for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQ9-0008C9-P0 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:49 +0000 Date: Sun, 13 Jul 2014 19:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Tweak .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5edd2fff0ea79f21647f455e82b568479aee8939 Author: Andrew Cooper AuthorDate: Mon Jul 7 11:27:33 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 10 15:50:26 2014 +0100 docs: Tweak .gitignore * Remove ignores for removed docs. * Introduce blanket ignores for the "output" directories, including txt/ which was previously missing. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- .gitignore | 43 +++---------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index cf9264f..fefe13c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,48 +40,11 @@ config/Toplevel.mk build-* dist/* -docs/autom4te.cache/ -docs/config.log -docs/config.status -docs/*.aux -docs/*.dvi -docs/*.log -docs/*.pdf -docs/*.ps -docs/*.toc -docs/api/* -docs/figs/xenserver.eps -docs/html/* -docs/interface/WARNINGS -docs/interface/images.pl -docs/interface/images.tex -docs/interface/img1.png -docs/interface/index.html -docs/interface/interface.css -docs/interface/interface.html -docs/interface/labels.pl +docs/html/ docs/man1/ docs/man5/ -docs/pdf/* -docs/ps/* -docs/user/WARNINGS -docs/user/images.pl -docs/user/images.tex -docs/user/img1.png -docs/user/img2.png -docs/user/img3.png -docs/user/index.html -docs/user/internals.pl -docs/user/labels.pl -docs/user/user.css -docs/user/user.html -docs/xen-api/vm_lifecycle.eps -docs/xen-api/xenapi-datamodel-graph.eps -docs/xen-api/xenapi.out -docs/xen-api/xenapi.dvi -docs/xen-api/xenapi.pdf -docs/xen-api/xenapi.ps -docs/xen-api/xenapi.toc +docs/pdf/ +docs/txt/ extras/mini-os/include/mini-os extras/mini-os/include/x86/mini-os extras/mini-os/include/xen -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQO-0006eb-P5; Sun, 13 Jul 2014 19:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQN-0006eK-NZ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:03 +0000 Received: from [85.158.137.68:49251] by server-14.bemta-3.messagelabs.com id F5/7F-19846-78DD2C35; Sun, 13 Jul 2014 19:27:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279620!15629209!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32631 invoked from network); 13 Jul 2014 19:27:01 -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; 13 Jul 2014 19:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQJ-0003Yx-Uh for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQJ-0008D3-TX for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:59 +0000 Date: Sun, 13 Jul 2014 19:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] init-xenstore-domain: Add optional ramdisk argument. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b764b0166b25b2d55732f329dacf56f370cf0572 Author: James Bielman AuthorDate: Mon Jul 7 14:52:24 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 10 15:51:19 2014 +0100 init-xenstore-domain: Add optional ramdisk argument. - Added an optional argument to allow passing a ramdisk to the Xenstore domain built by init-xenstore-domain. - This is needed for Xenstore/MAC to pass initial security policy. Signed-off-by: James Bielman Acked-by: Ian Campbell --- tools/xenstore/init-xenstore-domain.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c index 56a3c72..0d12169 100644 --- a/tools/xenstore/init-xenstore-domain.c +++ b/tools/xenstore/init-xenstore-domain.c @@ -13,7 +13,7 @@ static uint32_t domid = -1; -static int build(xc_interface *xch, char** argv) +static int build(xc_interface *xch, int argc, char** argv) { char cmdline[512]; uint32_t ssid; @@ -44,6 +44,12 @@ static int build(xc_interface *xch, char** argv) dom = xc_dom_allocate(xch, cmdline, NULL); rv = xc_dom_kernel_file(dom, argv[1]); if (rv) goto err; + + if (argc > 4) { + rv = xc_dom_ramdisk_file(dom, argv[4]); + if (rv) goto err; + } + rv = xc_dom_boot_xen_init(dom, xch, domid); if (rv) goto err; rv = xc_dom_parse_image(dom); @@ -81,15 +87,15 @@ int main(int argc, char** argv) char buf[16]; int rv, fd; - if (argc != 4) { - printf("Use: %s \n", argv[0]); + if (argc < 4 || argc > 5) { + printf("Use: %s []\n", argv[0]); return 2; } xch = xc_interface_open(NULL, NULL, 0); if (!xch) return 1; - rv = build(xch, argv); + rv = build(xch, argc, argv); xc_interface_close(xch); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQO-0006eb-P5; Sun, 13 Jul 2014 19:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQN-0006eK-NZ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:03 +0000 Received: from [85.158.137.68:49251] by server-14.bemta-3.messagelabs.com id F5/7F-19846-78DD2C35; Sun, 13 Jul 2014 19:27:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1405279620!15629209!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32631 invoked from network); 13 Jul 2014 19:27:01 -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; 13 Jul 2014 19:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQJ-0003Yx-Uh for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQJ-0008D3-TX for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:26:59 +0000 Date: Sun, 13 Jul 2014 19:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] init-xenstore-domain: Add optional ramdisk argument. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b764b0166b25b2d55732f329dacf56f370cf0572 Author: James Bielman AuthorDate: Mon Jul 7 14:52:24 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 10 15:51:19 2014 +0100 init-xenstore-domain: Add optional ramdisk argument. - Added an optional argument to allow passing a ramdisk to the Xenstore domain built by init-xenstore-domain. - This is needed for Xenstore/MAC to pass initial security policy. Signed-off-by: James Bielman Acked-by: Ian Campbell --- tools/xenstore/init-xenstore-domain.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c index 56a3c72..0d12169 100644 --- a/tools/xenstore/init-xenstore-domain.c +++ b/tools/xenstore/init-xenstore-domain.c @@ -13,7 +13,7 @@ static uint32_t domid = -1; -static int build(xc_interface *xch, char** argv) +static int build(xc_interface *xch, int argc, char** argv) { char cmdline[512]; uint32_t ssid; @@ -44,6 +44,12 @@ static int build(xc_interface *xch, char** argv) dom = xc_dom_allocate(xch, cmdline, NULL); rv = xc_dom_kernel_file(dom, argv[1]); if (rv) goto err; + + if (argc > 4) { + rv = xc_dom_ramdisk_file(dom, argv[4]); + if (rv) goto err; + } + rv = xc_dom_boot_xen_init(dom, xch, domid); if (rv) goto err; rv = xc_dom_parse_image(dom); @@ -81,15 +87,15 @@ int main(int argc, char** argv) char buf[16]; int rv, fd; - if (argc != 4) { - printf("Use: %s \n", argv[0]); + if (argc < 4 || argc > 5) { + printf("Use: %s []\n", argv[0]); return 2; } xch = xc_interface_open(NULL, NULL, 0); if (!xch) return 1; - rv = build(xch, argv); + rv = build(xch, argc, argv); xc_interface_close(xch); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQX-0006gK-Vk; Sun, 13 Jul 2014 19:27:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQW-0006fx-Fj for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:12 +0000 Received: from [85.158.139.211:5508] by server-8.bemta-5.messagelabs.com id 60/80-27672-F8DD2C35; Sun, 13 Jul 2014 19:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1405279630!15286849!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27824 invoked from network); 13 Jul 2014 19:27:11 -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; 13 Jul 2014 19:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQU-0003ZW-2w for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQU-0008Dx-1V for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:10 +0000 Date: Sun, 13 Jul 2014 19:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use proper path for 'do_flr' functionality. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab78724fc5628318b172b4344f7280621a151e1b Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jul 8 15:00:37 2014 -0400 Commit: Ian Campbell CommitDate: Thu Jul 10 15:54:16 2014 +0100 libxl: Use proper path for 'do_flr' functionality. Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups" introduced an regression where it changed the name from: /sys/bus/pci/drivers/pciback/do_flr to libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV); And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would do /sys/bus/pci/devices/pciback/do_flr. The proper define should have been SYSFS_PCIBACK_DRIVER, which is what this patch does. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 44d0453..2782d0e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -965,7 +965,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned char *reset; int fd, rc; - reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV); + reset = libxl__sprintf(gc, "%s/do_flr", SYSFS_PCIBACK_DRIVER); fd = open(reset, O_WRONLY); if (fd >= 0) { char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQX-0006gK-Vk; Sun, 13 Jul 2014 19:27:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQW-0006fx-Fj for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:12 +0000 Received: from [85.158.139.211:5508] by server-8.bemta-5.messagelabs.com id 60/80-27672-F8DD2C35; Sun, 13 Jul 2014 19:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1405279630!15286849!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27824 invoked from network); 13 Jul 2014 19:27:11 -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; 13 Jul 2014 19:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQU-0003ZW-2w for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQU-0008Dx-1V for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:10 +0000 Date: Sun, 13 Jul 2014 19:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use proper path for 'do_flr' functionality. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab78724fc5628318b172b4344f7280621a151e1b Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jul 8 15:00:37 2014 -0400 Commit: Ian Campbell CommitDate: Thu Jul 10 15:54:16 2014 +0100 libxl: Use proper path for 'do_flr' functionality. Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups" introduced an regression where it changed the name from: /sys/bus/pci/drivers/pciback/do_flr to libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV); And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would do /sys/bus/pci/devices/pciback/do_flr. The proper define should have been SYSFS_PCIBACK_DRIVER, which is what this patch does. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 44d0453..2782d0e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -965,7 +965,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned char *reset; int fd, rc; - reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV); + reset = libxl__sprintf(gc, "%s/do_flr", SYSFS_PCIBACK_DRIVER); fd = open(reset, O_WRONLY); if (fd >= 0) { char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQi-0006ho-2Y; Sun, 13 Jul 2014 19:27:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQg-0006ha-RZ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:22 +0000 Content-Length: 1776 Received: from [85.158.137.68:53670] by server-10.bemta-3.messagelabs.com id 6D/3E-27220-A9DD2C35; Sun, 13 Jul 2014 19:27:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1405279640!13220778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5248 invoked from network); 13 Jul 2014 19:27:21 -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; 13 Jul 2014 19:27:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQe-0003Zc-7m for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQe-0008EQ-67 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:20 +0000 Date: Sun, 13 Jul 2014 19:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix duplicate libxl_ctx typedef. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5931903633589887524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5931903633589887524== Content-Length: 1361 Content-Transfer-Encoding: quoted-printable commit 7bddc6b722bdd64475512bb18ca7b27dd550df3a Author: Wen Congyang AuthorDate: Fri Jul 11 11:32:33 2014 +0800 Commit: Ian Campbell CommitDate: Fri Jul 11 12:03:09 2014 +0100 libxl: Fix duplicate libxl_ctx typedef. commit de18e4c038306aeeca53e6e63e563036cafef162 introduces a build error with older gcc: In file included from xl.c:31: libxl.h:582: error: redefinition of typedef =E2=80=98libxl_ctx=E2=80=99 libxl.h:348: note: previous declaration of =E2=80=98libxl_ctx=E2=80=99 was here Signed-off-by: Wen Congyang Acked-by: Ian Campbell [ ijc -- rewrote commit message ] --- tools/libxl/libxl.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index e6e0301..5ae6532 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -579,8 +579,6 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 -typedef struct libxl__ctx libxl_ctx; - typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5931903633589887524== 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 --===============5931903633589887524==-- From xen-changelog-bounces@lists.xen.org Sun Jul 13 19:27:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 13 Jul 2014 19:27: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 1X6PQi-0006ho-2Y; Sun, 13 Jul 2014 19:27:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQg-0006ha-RZ for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:22 +0000 Content-Length: 1776 Received: from [85.158.137.68:53670] by server-10.bemta-3.messagelabs.com id 6D/3E-27220-A9DD2C35; Sun, 13 Jul 2014 19:27:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1405279640!13220778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5248 invoked from network); 13 Jul 2014 19:27:21 -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; 13 Jul 2014 19:27:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6PQe-0003Zc-7m for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6PQe-0008EQ-67 for xen-changelog@lists.xensource.com; Sun, 13 Jul 2014 19:27:20 +0000 Date: Sun, 13 Jul 2014 19:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix duplicate libxl_ctx typedef. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5931903633589887524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5931903633589887524== Content-Length: 1361 Content-Transfer-Encoding: quoted-printable commit 7bddc6b722bdd64475512bb18ca7b27dd550df3a Author: Wen Congyang AuthorDate: Fri Jul 11 11:32:33 2014 +0800 Commit: Ian Campbell CommitDate: Fri Jul 11 12:03:09 2014 +0100 libxl: Fix duplicate libxl_ctx typedef. commit de18e4c038306aeeca53e6e63e563036cafef162 introduces a build error with older gcc: In file included from xl.c:31: libxl.h:582: error: redefinition of typedef =E2=80=98libxl_ctx=E2=80=99 libxl.h:348: note: previous declaration of =E2=80=98libxl_ctx=E2=80=99 was here Signed-off-by: Wen Congyang Acked-by: Ian Campbell [ ijc -- rewrote commit message ] --- tools/libxl/libxl.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index e6e0301..5ae6532 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -579,8 +579,6 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 -typedef struct libxl__ctx libxl_ctx; - typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5931903633589887524== 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 --===============5931903633589887524==-- From xen-changelog-bounces@lists.xen.org Tue Jul 15 04:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33: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 1X6uQN-0005rC-9n; Tue, 15 Jul 2014 04:33:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQM-0005r3-8F for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:06 +0000 Received: from [193.109.254.147:65486] by server-5.bemta-14.messagelabs.com id AE/ED-23309-10FA4C35; Tue, 15 Jul 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1405398783!17469390!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21378 invoked from network); 15 Jul 2014 04:33:04 -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; 15 Jul 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQJ-00073k-Fo for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQJ-00069d-0T for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:03 +0000 Date: Tue, 15 Jul 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Use $(PTHREAD_LDFLAGS) and $(PTHREAD_LIBS) not -lpthread X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61ee098eb7b763ae6a90b334c8d1d2f6e5d96dcf Author: Ian Jackson AuthorDate: Wed May 28 17:06:50 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:38 2014 +0100 xenstore: Use $(PTHREAD_LDFLAGS) and $(PTHREAD_LIBS) not -lpthread Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: We need PTHREAD_LDFLAGS too (!) --- tools/xenstore/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index e34bd41..8421865 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -87,7 +87,7 @@ libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR) xs.opic: CFLAGS += -DUSE_PTHREAD libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) libxenstore.a: xs.o xs_lib.o $(AR) rcs $@ $^ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33: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 1X6uQN-0005rC-9n; Tue, 15 Jul 2014 04:33:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQM-0005r3-8F for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:06 +0000 Received: from [193.109.254.147:65486] by server-5.bemta-14.messagelabs.com id AE/ED-23309-10FA4C35; Tue, 15 Jul 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1405398783!17469390!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21378 invoked from network); 15 Jul 2014 04:33:04 -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; 15 Jul 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQJ-00073k-Fo for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQJ-00069d-0T for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:03 +0000 Date: Tue, 15 Jul 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Use $(PTHREAD_LDFLAGS) and $(PTHREAD_LIBS) not -lpthread X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61ee098eb7b763ae6a90b334c8d1d2f6e5d96dcf Author: Ian Jackson AuthorDate: Wed May 28 17:06:50 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:38 2014 +0100 xenstore: Use $(PTHREAD_LDFLAGS) and $(PTHREAD_LIBS) not -lpthread Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: We need PTHREAD_LDFLAGS too (!) --- tools/xenstore/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index e34bd41..8421865 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -87,7 +87,7 @@ libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR) xs.opic: CFLAGS += -DUSE_PTHREAD libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(SOCKET_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) libxenstore.a: xs.o xs_lib.o $(AR) rcs $@ $^ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQX-0005rm-DI; Tue, 15 Jul 2014 04:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQW-0005rf-U8 for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:17 +0000 Received: from [85.158.137.68:48810] by server-9.bemta-3.messagelabs.com id BC/FF-09496-B0FA4C35; Tue, 15 Jul 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1405398794!15862192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17239 invoked from network); 15 Jul 2014 04:33:15 -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; 15 Jul 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQT-00073q-PR for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQT-0006A1-Iw for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:13 +0000 Date: Tue, 15 Jul 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: In xenstore_client, avoid stack buffer in recursive 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 848a23560fc847a4a58db138c39a0cfa4ff96f59 Author: Ian Jackson AuthorDate: Fri Jun 20 11:54:56 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: In xenstore_client, avoid stack buffer in recursive function do_ls is recursive. It had a buffer of size around 5K allocated on the stack. This combination is not a very good idea: some environments (eg, Mini-OS) have limited stack sizes (eg 64K). Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/xenstore/xenstore_client.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 56b9309..1054f18 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -128,11 +128,15 @@ static int show_whole_path = 0; static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms) { char **e; - char newpath[STRING_MAX], *val; + char *newpath, *val; int newpath_len; int i; unsigned int num, len; + newpath = malloc(STRING_MAX); + if (!newpath) + err(1, "malloc in do_ls"); + e = xs_directory(h, XBT_NULL, path, &num); if (e == NULL) err(1, "xs_directory (%s)", path); @@ -144,7 +148,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms int linewid; /* Compose fullpath */ - newpath_len = snprintf(newpath, sizeof(newpath), "%s%s%s", path, + newpath_len = snprintf(newpath, STRING_MAX, "%s%s%s", path, path[strlen(path)-1] == '/' ? "" : "/", e[i]); @@ -161,7 +165,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms } /* Fetch value */ - if ( newpath_len < sizeof(newpath) ) { + if ( newpath_len < STRING_MAX ) { val = xs_read(h, XBT_NULL, newpath, &len); } else { @@ -217,6 +221,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms do_ls(h, newpath, cur_depth+1, show_perms); } free(e); + free(newpath); } static 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 Tue Jul 15 04:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQX-0005rm-DI; Tue, 15 Jul 2014 04:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQW-0005rf-U8 for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:17 +0000 Received: from [85.158.137.68:48810] by server-9.bemta-3.messagelabs.com id BC/FF-09496-B0FA4C35; Tue, 15 Jul 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1405398794!15862192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17239 invoked from network); 15 Jul 2014 04:33:15 -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; 15 Jul 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQT-00073q-PR for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQT-0006A1-Iw for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:13 +0000 Date: Tue, 15 Jul 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: In xenstore_client, avoid stack buffer in recursive 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 848a23560fc847a4a58db138c39a0cfa4ff96f59 Author: Ian Jackson AuthorDate: Fri Jun 20 11:54:56 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: In xenstore_client, avoid stack buffer in recursive function do_ls is recursive. It had a buffer of size around 5K allocated on the stack. This combination is not a very good idea: some environments (eg, Mini-OS) have limited stack sizes (eg 64K). Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/xenstore/xenstore_client.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 56b9309..1054f18 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -128,11 +128,15 @@ static int show_whole_path = 0; static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms) { char **e; - char newpath[STRING_MAX], *val; + char *newpath, *val; int newpath_len; int i; unsigned int num, len; + newpath = malloc(STRING_MAX); + if (!newpath) + err(1, "malloc in do_ls"); + e = xs_directory(h, XBT_NULL, path, &num); if (e == NULL) err(1, "xs_directory (%s)", path); @@ -144,7 +148,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms int linewid; /* Compose fullpath */ - newpath_len = snprintf(newpath, sizeof(newpath), "%s%s%s", path, + newpath_len = snprintf(newpath, STRING_MAX, "%s%s%s", path, path[strlen(path)-1] == '/' ? "" : "/", e[i]); @@ -161,7 +165,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms } /* Fetch value */ - if ( newpath_len < sizeof(newpath) ) { + if ( newpath_len < STRING_MAX ) { val = xs_read(h, XBT_NULL, newpath, &len); } else { @@ -217,6 +221,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms do_ls(h, newpath, cur_depth+1, show_perms); } free(e); + free(newpath); } static 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 Tue Jul 15 04:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uQh-0005t8-GT; Tue, 15 Jul 2014 04:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQg-0005t0-SD for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:26 +0000 Received: from [85.158.137.68:43788] by server-8.bemta-3.messagelabs.com id 70/1C-00810-61FA4C35; Tue, 15 Jul 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1405398804!15962317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2192 invoked from network); 15 Jul 2014 04:33: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; 15 Jul 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQe-000742-21 for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQd-0006At-SU for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:23 +0000 Date: Tue, 15 Jul 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rump kernels: Start introducing new XEN_OS NetBSDRump X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b24cc32251f4e6dbb04165b7ba33b45fa0994d94 Author: Ian Jackson AuthorDate: Wed May 28 17:07:37 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 rump kernels: Start introducing new XEN_OS NetBSDRump Provide an entry in config/, and a copy of xen-sys privcmd.h. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- config/NetBSDRump.mk | 8 +++++++ tools/include/xen-sys/NetBSDRump/privcmd.h | 31 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk new file mode 100644 index 0000000..e063272 --- /dev/null +++ b/config/NetBSDRump.mk @@ -0,0 +1,8 @@ +include $(XEN_ROOT)/config/StdGNU.mk + +DLOPEN_LIBS = +PTHREAD_LIBS = + +XEN_LOCK_DIR = /var/lib + +WGET = ftp diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h new file mode 100644 index 0000000..efdcae9 --- /dev/null +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -0,0 +1,31 @@ + +#ifndef __NetBSDRump_PRIVCMD_H__ +#define __NetBSDRump_PRIVCMD_H__ + +typedef struct privcmd_hypercall +{ + unsigned long op; + unsigned long arg[5]; + long retval; +} privcmd_hypercall_t; + +typedef struct privcmd_mmap_entry { + unsigned long va; + unsigned long mfn; + unsigned long npages; +} privcmd_mmap_entry_t; + +typedef struct privcmd_mmap { + int num; + domid_t dom; /* target domain */ + privcmd_mmap_entry_t *entry; +} privcmd_mmap_t; + +typedef struct privcmd_mmapbatch { + int num; /* number of pages to populate */ + domid_t dom; /* target domain */ + unsigned long addr; /* virtual address */ + unsigned long *arr; /* array of mfns - top nibble set on err */ +} privcmd_mmapbatch_t; + +#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 Tue Jul 15 04:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uQh-0005t8-GT; Tue, 15 Jul 2014 04:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQg-0005t0-SD for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:26 +0000 Received: from [85.158.137.68:43788] by server-8.bemta-3.messagelabs.com id 70/1C-00810-61FA4C35; Tue, 15 Jul 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1405398804!15962317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2192 invoked from network); 15 Jul 2014 04:33: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; 15 Jul 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQe-000742-21 for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQd-0006At-SU for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:23 +0000 Date: Tue, 15 Jul 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rump kernels: Start introducing new XEN_OS NetBSDRump X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b24cc32251f4e6dbb04165b7ba33b45fa0994d94 Author: Ian Jackson AuthorDate: Wed May 28 17:07:37 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 rump kernels: Start introducing new XEN_OS NetBSDRump Provide an entry in config/, and a copy of xen-sys privcmd.h. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- config/NetBSDRump.mk | 8 +++++++ tools/include/xen-sys/NetBSDRump/privcmd.h | 31 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk new file mode 100644 index 0000000..e063272 --- /dev/null +++ b/config/NetBSDRump.mk @@ -0,0 +1,8 @@ +include $(XEN_ROOT)/config/StdGNU.mk + +DLOPEN_LIBS = +PTHREAD_LIBS = + +XEN_LOCK_DIR = /var/lib + +WGET = ftp diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h new file mode 100644 index 0000000..efdcae9 --- /dev/null +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -0,0 +1,31 @@ + +#ifndef __NetBSDRump_PRIVCMD_H__ +#define __NetBSDRump_PRIVCMD_H__ + +typedef struct privcmd_hypercall +{ + unsigned long op; + unsigned long arg[5]; + long retval; +} privcmd_hypercall_t; + +typedef struct privcmd_mmap_entry { + unsigned long va; + unsigned long mfn; + unsigned long npages; +} privcmd_mmap_entry_t; + +typedef struct privcmd_mmap { + int num; + domid_t dom; /* target domain */ + privcmd_mmap_entry_t *entry; +} privcmd_mmap_t; + +typedef struct privcmd_mmapbatch { + int num; /* number of pages to populate */ + domid_t dom; /* target domain */ + unsigned long addr; /* virtual address */ + unsigned long *arr; /* array of mfns - top nibble set on err */ +} privcmd_mmapbatch_t; + +#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 Tue Jul 15 04:33:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uQr-0005ue-JP; Tue, 15 Jul 2014 04:33:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQq-0005uQ-HC for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:36 +0000 Received: from [85.158.143.35:64067] by server-3.bemta-4.messagelabs.com id 85/25-09960-F1FA4C35; Tue, 15 Jul 2014 04:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405398814!17727474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3663 invoked from network); 15 Jul 2014 04:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2014 04:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQo-00074A-6l for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQo-0006BP-5h for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:34 +0000 Date: Tue, 15 Jul 2014 04:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: rump kernels: Use standard xc_osdep_get_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79b4ef15ee1088161c4d4e7471abd22527c4108c Author: Ian Jackson AuthorDate: Wed May 28 17:06:21 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 libxc: rump kernels: Use standard xc_osdep_get_info Do not try to support the dlopen-based xc indirection. Introduce a local #define DO_DYNAMIC_OSDEP to centralise the condition. Add comments to the #endifs. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Remove duplication by introducing DO_DYNAMIC_OSDEP. Add comments to the #endifs. --- tools/libxc/xc_private.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index a3da614..1c214dd 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -33,6 +33,10 @@ #define XENCTRL_OSDEP "XENCTRL_OSDEP" +#if !defined (__MINIOS__) && !defined(__RUMPUSER_XEN__) +#define DO_DYNAMIC_OSDEP +#endif + /* * Returns a (shallow) copy of the xc_osdep_info_t for the * active OS interface. @@ -50,7 +54,7 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) { int rc = -1; -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP const char *lib = getenv(XENCTRL_OSDEP); xc_osdep_info_t *pinfo; void *dl_handle = NULL; @@ -86,7 +90,7 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) info->dl_handle = dl_handle; } else -#endif +#endif /*DO_DYNAMIC_OSDEP*/ { *info = xc_osdep_info; info->dl_handle = NULL; @@ -94,21 +98,21 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) rc = 0; -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP out: if ( dl_handle && rc == -1 ) dlclose(dl_handle); -#endif +#endif /*DO_DYNAMIC_OSDEP*/ return rc; } static void xc_osdep_put(xc_osdep_info_t *info) { -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP if ( info->dl_handle ) dlclose(info->dl_handle); -#endif +#endif /*DO_DYNAMIC_OSDEP*/ } static const char *xc_osdep_type_name(enum xc_osdep_type 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 Tue Jul 15 04:33:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uQr-0005ue-JP; Tue, 15 Jul 2014 04:33:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQq-0005uQ-HC for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:36 +0000 Received: from [85.158.143.35:64067] by server-3.bemta-4.messagelabs.com id 85/25-09960-F1FA4C35; Tue, 15 Jul 2014 04:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405398814!17727474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3663 invoked from network); 15 Jul 2014 04:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2014 04:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQo-00074A-6l for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQo-0006BP-5h for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:34 +0000 Date: Tue, 15 Jul 2014 04:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: rump kernels: Use standard xc_osdep_get_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79b4ef15ee1088161c4d4e7471abd22527c4108c Author: Ian Jackson AuthorDate: Wed May 28 17:06:21 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 libxc: rump kernels: Use standard xc_osdep_get_info Do not try to support the dlopen-based xc indirection. Introduce a local #define DO_DYNAMIC_OSDEP to centralise the condition. Add comments to the #endifs. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Remove duplication by introducing DO_DYNAMIC_OSDEP. Add comments to the #endifs. --- tools/libxc/xc_private.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index a3da614..1c214dd 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -33,6 +33,10 @@ #define XENCTRL_OSDEP "XENCTRL_OSDEP" +#if !defined (__MINIOS__) && !defined(__RUMPUSER_XEN__) +#define DO_DYNAMIC_OSDEP +#endif + /* * Returns a (shallow) copy of the xc_osdep_info_t for the * active OS interface. @@ -50,7 +54,7 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) { int rc = -1; -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP const char *lib = getenv(XENCTRL_OSDEP); xc_osdep_info_t *pinfo; void *dl_handle = NULL; @@ -86,7 +90,7 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) info->dl_handle = dl_handle; } else -#endif +#endif /*DO_DYNAMIC_OSDEP*/ { *info = xc_osdep_info; info->dl_handle = NULL; @@ -94,21 +98,21 @@ static int xc_osdep_get_info(xc_interface *xch, xc_osdep_info_t *info) rc = 0; -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP out: if ( dl_handle && rc == -1 ) dlclose(dl_handle); -#endif +#endif /*DO_DYNAMIC_OSDEP*/ return rc; } static void xc_osdep_put(xc_osdep_info_t *info) { -#ifndef __MINIOS__ +#ifdef DO_DYNAMIC_OSDEP if ( info->dl_handle ) dlclose(info->dl_handle); -#endif +#endif /*DO_DYNAMIC_OSDEP*/ } static const char *xc_osdep_type_name(enum xc_osdep_type 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 Tue Jul 15 04:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33: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 1X6uR2-0005wU-5L; Tue, 15 Jul 2014 04:33:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uR0-0005wD-VY for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:47 +0000 Received: from [85.158.143.35:2530] by server-2.bemta-4.messagelabs.com id 3C/F5-26128-A2FA4C35; Tue, 15 Jul 2014 04:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1405398824!17698759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12062 invoked from network); 15 Jul 2014 04:33:45 -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 Jul 2014 04:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQy-00074J-FC for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQy-0006Bz-9p for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:44 +0000 Date: Tue, 15 Jul 2014 04:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: rump kernels: Look for /dev/xen/xenbus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 665e2160f6324060f06e1659bc718df4fc0a5723 Author: Ian Jackson AuthorDate: Thu Jun 19 18:54:35 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: rump kernels: Look for /dev/xen/xenbus Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/xenstore/xs_lib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index f7076cc..9a78755 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -79,8 +79,9 @@ const char *xs_domain_dev(void) char *s = getenv("XENSTORED_PATH"); if (s) return s; - -#if defined(__linux__) +#if defined(__RUMPUSER_XEN__) + return "/dev/xen/xenbus"; +#elif defined(__linux__) return "/proc/xen/xenbus"; #elif defined(__NetBSD__) return "/kern/xen/xenbus"; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:33: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 1X6uR2-0005wU-5L; Tue, 15 Jul 2014 04:33:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uR0-0005wD-VY for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:47 +0000 Received: from [85.158.143.35:2530] by server-2.bemta-4.messagelabs.com id 3C/F5-26128-A2FA4C35; Tue, 15 Jul 2014 04:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1405398824!17698759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12062 invoked from network); 15 Jul 2014 04:33:45 -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 Jul 2014 04:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uQy-00074J-FC for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uQy-0006Bz-9p for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:44 +0000 Date: Tue, 15 Jul 2014 04:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: rump kernels: Look for /dev/xen/xenbus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 665e2160f6324060f06e1659bc718df4fc0a5723 Author: Ian Jackson AuthorDate: Thu Jun 19 18:54:35 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: rump kernels: Look for /dev/xen/xenbus Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/xenstore/xs_lib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index f7076cc..9a78755 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -79,8 +79,9 @@ const char *xs_domain_dev(void) char *s = getenv("XENSTORED_PATH"); if (s) return s; - -#if defined(__linux__) +#if defined(__RUMPUSER_XEN__) + return "/dev/xen/xenbus"; +#elif defined(__linux__) return "/proc/xen/xenbus"; #elif defined(__NetBSD__) return "/kern/xen/xenbus"; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRC-0005yc-9r; Tue, 15 Jul 2014 04:33:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRA-0005yJ-VL for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:57 +0000 Received: from [85.158.143.35:2891] by server-3.bemta-4.messagelabs.com id D0/45-09960-43FA4C35; Tue, 15 Jul 2014 04:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405398834!17727516!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4778 invoked from network); 15 Jul 2014 04:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2014 04:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uR8-00074V-Jw for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uR8-0006CR-Iy for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:54 +0000 Date: Tue, 15 Jul 2014 04:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Make building of xenstored optional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b76b4bb13407489b9f803c4b101d4c516650e2e Author: Ian Jackson AuthorDate: Wed Jun 25 10:54:54 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: Make building of xenstored optional In principle it would be possible to make a rumpuser-xen-based stub xenstored, but all the necessary pieces do not yet exist. So provide a facility to disable compilation of xenstored, and use it to disable it on rump kernels. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- config/NetBSDRump.mk | 2 ++ tools/Rules.mk | 2 ++ tools/xenstore/Makefile | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk index e063272..e32c1cd 100644 --- a/config/NetBSDRump.mk +++ b/config/NetBSDRump.mk @@ -6,3 +6,5 @@ PTHREAD_LIBS = XEN_LOCK_DIR = /var/lib WGET = ftp + +XENSTORE_XENSTORED=n diff --git a/tools/Rules.mk b/tools/Rules.mk index 13d8fc1..0a8dd3e 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -19,6 +19,8 @@ XEN_LIBVCHAN = $(XEN_ROOT)/tools/libvchan CFLAGS_xeninclude = -I$(XEN_INCLUDE) +XENSTORE_XENSTORED ?= y + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 8421865..a9473d6 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -28,7 +28,10 @@ LIBXENSTORE := libxenstore.a xenstore xenstore-control: CFLAGS += -static endif -ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump xenstored +ALL_TARGETS = libxenstore.so libxenstore.a clients +ifeq ($(XENSTORE_XENSTORED),y) +ALL_TARGETS += xs_tdb_dump xenstored +endif ifeq ($(CONFIG_Linux),y) ALL_TARGETS += init-xenstore-domain @@ -114,8 +117,10 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat +ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) +endif $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) set -e ; for c in $(CLIENTS) ; do \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRC-0005yc-9r; Tue, 15 Jul 2014 04:33:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRA-0005yJ-VL for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:57 +0000 Received: from [85.158.143.35:2891] by server-3.bemta-4.messagelabs.com id D0/45-09960-43FA4C35; Tue, 15 Jul 2014 04:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405398834!17727516!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4778 invoked from network); 15 Jul 2014 04:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2014 04:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uR8-00074V-Jw for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uR8-0006CR-Iy for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:33:54 +0000 Date: Tue, 15 Jul 2014 04:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Make building of xenstored optional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b76b4bb13407489b9f803c4b101d4c516650e2e Author: Ian Jackson AuthorDate: Wed Jun 25 10:54:54 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 xenstore: Make building of xenstored optional In principle it would be possible to make a rumpuser-xen-based stub xenstored, but all the necessary pieces do not yet exist. So provide a facility to disable compilation of xenstored, and use it to disable it on rump kernels. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- config/NetBSDRump.mk | 2 ++ tools/Rules.mk | 2 ++ tools/xenstore/Makefile | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk index e063272..e32c1cd 100644 --- a/config/NetBSDRump.mk +++ b/config/NetBSDRump.mk @@ -6,3 +6,5 @@ PTHREAD_LIBS = XEN_LOCK_DIR = /var/lib WGET = ftp + +XENSTORE_XENSTORED=n diff --git a/tools/Rules.mk b/tools/Rules.mk index 13d8fc1..0a8dd3e 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -19,6 +19,8 @@ XEN_LIBVCHAN = $(XEN_ROOT)/tools/libvchan CFLAGS_xeninclude = -I$(XEN_INCLUDE) +XENSTORE_XENSTORED ?= y + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 8421865..a9473d6 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -28,7 +28,10 @@ LIBXENSTORE := libxenstore.a xenstore xenstore-control: CFLAGS += -static endif -ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump xenstored +ALL_TARGETS = libxenstore.so libxenstore.a clients +ifeq ($(XENSTORE_XENSTORED),y) +ALL_TARGETS += xs_tdb_dump xenstored +endif ifeq ($(CONFIG_Linux),y) ALL_TARGETS += init-xenstore-domain @@ -114,8 +117,10 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat +ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) +endif $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) set -e ; for c in $(CLIENTS) ; do \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:34: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 1X6uRN-00060y-Cv; Tue, 15 Jul 2014 04:34:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRL-00060O-Qo for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:08 +0000 Received: from [85.158.137.68:45116] by server-13.bemta-3.messagelabs.com id 7B/3D-20015-F3FA4C35; Tue, 15 Jul 2014 04:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405398845!15956856!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 573 invoked from network); 15 Jul 2014 04:34:06 -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 Jul 2014 04:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRI-000754-Oh for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRI-0006Cx-NM for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:04 +0000 Date: Tue, 15 Jul 2014 04:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce INSTALL_SHLIB and SYMLINK_SHLIB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0343a41c86841d1296aab080a006bd74e4669e2f Author: Ian Jackson AuthorDate: Wed Jun 25 10:54:38 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce INSTALL_SHLIB and SYMLINK_SHLIB INSTALL_SHLIB is like INSTALL_PROG but used only for shared libraries. SYMLINK_SHLIB is the ln -sf rune for shared library symlinks. Use these in the appropriate places in tools/libxc and tools/xenstore. No functional change right now. In a forthcoming patch these variables might take on different values. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 3 +++ tools/libxc/Makefile | 20 ++++++++++---------- tools/libxl/Makefile | 20 ++++++++++---------- tools/xenstore/Makefile | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 0a8dd3e..cbdd741 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -21,6 +21,9 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE) XENSTORE_XENSTORED ?= y +INSTALL_SHLIB = $(INSTALL_PROG) +SYMLINK_SHLIB = ln -sf + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f77677c..4020f37 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -136,15 +136,15 @@ libs: $(LIB) install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) - ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) - ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) - ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS @@ -174,9 +174,9 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ libxenctrl.so: libxenctrl.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) @@ -187,9 +187,9 @@ libxenguest.a: $(GUEST_LIB_OBJS) $(AR) rc $@ $^ libxenguest.so: libxenguest.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ ifeq ($(CONFIG_MiniOS),y) zlib-options = diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index dd3dd8f..bd0db3b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -193,10 +193,10 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) libxenlight.so: libxenlight.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) @@ -208,10 +208,10 @@ libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ libxlutil.so: libxlutil.so.$(XLUMAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) @@ -240,13 +240,13 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) - ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so + $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) - ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so + $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a9473d6..0cf06f1 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -127,7 +127,7 @@ endif ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ done $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:34: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 1X6uRN-00060y-Cv; Tue, 15 Jul 2014 04:34:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRL-00060O-Qo for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:08 +0000 Received: from [85.158.137.68:45116] by server-13.bemta-3.messagelabs.com id 7B/3D-20015-F3FA4C35; Tue, 15 Jul 2014 04:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405398845!15956856!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 573 invoked from network); 15 Jul 2014 04:34:06 -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 Jul 2014 04:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRI-000754-Oh for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRI-0006Cx-NM for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:04 +0000 Date: Tue, 15 Jul 2014 04:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce INSTALL_SHLIB and SYMLINK_SHLIB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0343a41c86841d1296aab080a006bd74e4669e2f Author: Ian Jackson AuthorDate: Wed Jun 25 10:54:38 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce INSTALL_SHLIB and SYMLINK_SHLIB INSTALL_SHLIB is like INSTALL_PROG but used only for shared libraries. SYMLINK_SHLIB is the ln -sf rune for shared library symlinks. Use these in the appropriate places in tools/libxc and tools/xenstore. No functional change right now. In a forthcoming patch these variables might take on different values. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 3 +++ tools/libxc/Makefile | 20 ++++++++++---------- tools/libxl/Makefile | 20 ++++++++++---------- tools/xenstore/Makefile | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 0a8dd3e..cbdd741 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -21,6 +21,9 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE) XENSTORE_XENSTORED ?= y +INSTALL_SHLIB = $(INSTALL_PROG) +SYMLINK_SHLIB = ln -sf + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f77677c..4020f37 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -136,15 +136,15 @@ libs: $(LIB) install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) - ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) - ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) - ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS @@ -174,9 +174,9 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ libxenctrl.so: libxenctrl.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) @@ -187,9 +187,9 @@ libxenguest.a: $(GUEST_LIB_OBJS) $(AR) rc $@ $^ libxenguest.so: libxenguest.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ ifeq ($(CONFIG_MiniOS),y) zlib-options = diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index dd3dd8f..bd0db3b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -193,10 +193,10 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) libxenlight.so: libxenlight.so.$(MAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) @@ -208,10 +208,10 @@ libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ libxlutil.so: libxlutil.so.$(XLUMAJOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) - ln -sf $< $@ + $(SYMLINK_SHLIB) $< $@ libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) @@ -240,13 +240,13 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) - ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so + $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) - ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so + $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a9473d6..0cf06f1 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -127,7 +127,7 @@ endif ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ done $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRW-00062y-NN; Tue, 15 Jul 2014 04:34:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRV-00062h-NV for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:17 +0000 Received: from [85.158.143.35:6034] by server-2.bemta-4.messagelabs.com id 32/36-26128-94FA4C35; Tue, 15 Jul 2014 04:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1405398855!17638180!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15990 invoked from network); 15 Jul 2014 04:34:16 -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; 15 Jul 2014 04:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRT-00075C-6B for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRT-0006DX-4R for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:15 +0000 Date: Tue, 15 Jul 2014 04:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce libextension 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 53e0a72be7eb9a1abab974c12c0aa53d82fef5a3 Author: Ian Jackson AuthorDate: Wed May 28 17:05:19 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce libextension variable This variable is the suffix to use for finding libraries when doing compile-time linking. For now we always set it to ".so" - so no functional change. In a forthcoming patch it may take on different values. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index cbdd741..327d2b4 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -23,21 +23,22 @@ XENSTORE_XENSTORED ?= y INSTALL_SHLIB = $(INSTALL_PROG) SYMLINK_SHLIB = ln -sf +libextension = .so CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) -LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so +LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) -LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so +LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest$(libextension) SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC) CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) -LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so +LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore$(libextension) SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE) CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT) -LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat.so +LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat$(libextension) SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT) CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) @@ -61,7 +62,7 @@ SHLIB_libblktapctl = endif CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) +LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight$(libextension) $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRW-00062y-NN; Tue, 15 Jul 2014 04:34:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRV-00062h-NV for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:17 +0000 Received: from [85.158.143.35:6034] by server-2.bemta-4.messagelabs.com id 32/36-26128-94FA4C35; Tue, 15 Jul 2014 04:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1405398855!17638180!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15990 invoked from network); 15 Jul 2014 04:34:16 -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; 15 Jul 2014 04:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRT-00075C-6B for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRT-0006DX-4R for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:15 +0000 Date: Tue, 15 Jul 2014 04:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce libextension 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 53e0a72be7eb9a1abab974c12c0aa53d82fef5a3 Author: Ian Jackson AuthorDate: Wed May 28 17:05:19 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce libextension variable This variable is the suffix to use for finding libraries when doing compile-time linking. For now we always set it to ".so" - so no functional change. In a forthcoming patch it may take on different values. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index cbdd741..327d2b4 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -23,21 +23,22 @@ XENSTORE_XENSTORED ?= y INSTALL_SHLIB = $(INSTALL_PROG) SYMLINK_SHLIB = ln -sf +libextension = .so CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) -LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so +LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) -LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so +LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest$(libextension) SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC) CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) -LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so +LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore$(libextension) SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE) CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT) -LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat.so +LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat$(libextension) SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT) CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) @@ -61,7 +62,7 @@ SHLIB_libblktapctl = endif CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) +LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight$(libextension) $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRg-00064i-QZ; Tue, 15 Jul 2014 04:34:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRg-00064U-0j for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:28 +0000 Received: from [85.158.143.35:6363] by server-1.bemta-4.messagelabs.com id 6A/7D-30046-35FA4C35; Tue, 15 Jul 2014 04:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1405398865!9671608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32185 invoked from network); 15 Jul 2014 04:34:26 -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; 15 Jul 2014 04:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRd-00075I-Cp for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRd-0006Es-9w for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:25 +0000 Date: Tue, 15 Jul 2014 04:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce nosharedlibs 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 70d597d0efb85459ee8f7c1498f22ee7ffd390dd Author: Ian Jackson AuthorDate: Wed May 28 17:06:02 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce nosharedlibs variable. Introduce a new build variable "nosharedlibs". In tools/libxc use it instead of $(stubdom). In tools/xenstore honour it, and build static clients. If shared libs are disabled, do not try to install or symlink them. Set nosharedlibs when building for MiniOS or NetBSDRump. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Clarify deliberate INSTALL_SHLIB and SYMLINK_SHLIB breakage. --- config/MiniOS.mk | 1 + config/NetBSDRump.mk | 1 + tools/Rules.mk | 9 +++++++++ tools/libxc/Makefile | 6 +++--- tools/xenstore/Makefile | 5 ++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/config/MiniOS.mk b/config/MiniOS.mk index fc02b70..32260ad 100644 --- a/config/MiniOS.mk +++ b/config/MiniOS.mk @@ -7,3 +7,4 @@ LDFLAGS += $(DEF_LDFLAGS) $(ARCH_LDFLAGS) # Override settings for this OS PTHREAD_LIBS = +nosharedlibs=y diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk index e32c1cd..8daade8 100644 --- a/config/NetBSDRump.mk +++ b/config/NetBSDRump.mk @@ -8,3 +8,4 @@ XEN_LOCK_DIR = /var/lib WGET = ftp XENSTORE_XENSTORED=n +nosharedlibs=y diff --git a/tools/Rules.mk b/tools/Rules.mk index 327d2b4..9ac8541 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -21,9 +21,18 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE) XENSTORE_XENSTORED ?= y +ifneq ($(nosharedlibs),y) INSTALL_SHLIB = $(INSTALL_PROG) SYMLINK_SHLIB = ln -sf libextension = .so +else +libextension = .a +XENSTORE_STATIC_CLIENTS=y +# If something tries to use these it is a mistake. Provide references +# to nonexistent programs to produce a sane error message. +INSTALL_SHLIB = : install-shlib-unsupported-fail +SYMLINK_SHLIB = : symlink-shlib-unsupported-fail +endif CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 4020f37..22eef8e 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -109,16 +109,16 @@ $(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) $(OSDEP_LIB_OBJS) \ $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS) $(OSDEP_PIC_OBJS) : CFLAGS += -include $(XEN_ROOT)/tools/config.h LIB := libxenctrl.a -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR) endif LIB += libxenguest.a -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR) endif -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += xenctrl_osdep_ENOSYS.so endif diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 0cf06f1..48b4e3d 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -28,7 +28,10 @@ LIBXENSTORE := libxenstore.a xenstore xenstore-control: CFLAGS += -static endif -ALL_TARGETS = libxenstore.so libxenstore.a clients +ALL_TARGETS = libxenstore.a clients +ifneq ($(nosharedlibs),y) +ALL_TARGETS += libxenstore.so +endif ifeq ($(XENSTORE_XENSTORED),y) ALL_TARGETS += xs_tdb_dump xenstored 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 Tue Jul 15 04:34:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uRg-00064i-QZ; Tue, 15 Jul 2014 04:34:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRg-00064U-0j for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:28 +0000 Received: from [85.158.143.35:6363] by server-1.bemta-4.messagelabs.com id 6A/7D-30046-35FA4C35; Tue, 15 Jul 2014 04:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1405398865!9671608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32185 invoked from network); 15 Jul 2014 04:34:26 -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; 15 Jul 2014 04:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRd-00075I-Cp for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRd-0006Es-9w for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:25 +0000 Date: Tue, 15 Jul 2014 04:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: Introduce nosharedlibs 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 70d597d0efb85459ee8f7c1498f22ee7ffd390dd Author: Ian Jackson AuthorDate: Wed May 28 17:06:02 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 build system: Introduce nosharedlibs variable. Introduce a new build variable "nosharedlibs". In tools/libxc use it instead of $(stubdom). In tools/xenstore honour it, and build static clients. If shared libs are disabled, do not try to install or symlink them. Set nosharedlibs when building for MiniOS or NetBSDRump. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Clarify deliberate INSTALL_SHLIB and SYMLINK_SHLIB breakage. --- config/MiniOS.mk | 1 + config/NetBSDRump.mk | 1 + tools/Rules.mk | 9 +++++++++ tools/libxc/Makefile | 6 +++--- tools/xenstore/Makefile | 5 ++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/config/MiniOS.mk b/config/MiniOS.mk index fc02b70..32260ad 100644 --- a/config/MiniOS.mk +++ b/config/MiniOS.mk @@ -7,3 +7,4 @@ LDFLAGS += $(DEF_LDFLAGS) $(ARCH_LDFLAGS) # Override settings for this OS PTHREAD_LIBS = +nosharedlibs=y diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk index e32c1cd..8daade8 100644 --- a/config/NetBSDRump.mk +++ b/config/NetBSDRump.mk @@ -8,3 +8,4 @@ XEN_LOCK_DIR = /var/lib WGET = ftp XENSTORE_XENSTORED=n +nosharedlibs=y diff --git a/tools/Rules.mk b/tools/Rules.mk index 327d2b4..9ac8541 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -21,9 +21,18 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE) XENSTORE_XENSTORED ?= y +ifneq ($(nosharedlibs),y) INSTALL_SHLIB = $(INSTALL_PROG) SYMLINK_SHLIB = ln -sf libextension = .so +else +libextension = .a +XENSTORE_STATIC_CLIENTS=y +# If something tries to use these it is a mistake. Provide references +# to nonexistent programs to produce a sane error message. +INSTALL_SHLIB = : install-shlib-unsupported-fail +SYMLINK_SHLIB = : symlink-shlib-unsupported-fail +endif CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 4020f37..22eef8e 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -109,16 +109,16 @@ $(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) $(OSDEP_LIB_OBJS) \ $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS) $(OSDEP_PIC_OBJS) : CFLAGS += -include $(XEN_ROOT)/tools/config.h LIB := libxenctrl.a -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR) endif LIB += libxenguest.a -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR) endif -ifneq ($(stubdom),y) +ifneq ($(nosharedlibs),y) LIB += xenctrl_osdep_ENOSYS.so endif diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 0cf06f1..48b4e3d 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -28,7 +28,10 @@ LIBXENSTORE := libxenstore.a xenstore xenstore-control: CFLAGS += -static endif -ALL_TARGETS = libxenstore.so libxenstore.a clients +ALL_TARGETS = libxenstore.a clients +ifneq ($(nosharedlibs),y) +ALL_TARGETS += libxenstore.so +endif ifeq ($(XENSTORE_XENSTORED),y) ALL_TARGETS += xs_tdb_dump xenstored 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 Tue Jul 15 04:34:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:34: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 1X6uRq-000671-Tp; Tue, 15 Jul 2014 04:34:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRq-00066m-3e for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:38 +0000 Received: from [193.109.254.147:17590] by server-15.bemta-14.messagelabs.com id 49/01-11012-D5FA4C35; Tue, 15 Jul 2014 04:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1405398875!17427036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1090 invoked from network); 15 Jul 2014 04:34: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; 15 Jul 2014 04:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRn-00075Q-JQ for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRn-0006FX-Hs for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:35 +0000 Date: Tue, 15 Jul 2014 04:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rump kernels: Handle rumpxen host in configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 69ba39ec0501874f7fa028362c864d67ee29fadc Author: Ian Jackson AuthorDate: Wed May 28 17:04:52 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 rump kernels: Handle rumpxen host in configure Support ./configure --host=x86_64-rumpxen-netbsd ./configure --host=i386-rumpxen-netbsd Setting --host tells configure we are cross compiling and therefore has various automatic effects. But in this patch we make some deliberate changes as well: * We disable a large number of configure tests for libraries etc. which don't exist. * We set CONFIG_RUMP in Tools.mk. * Hence, we automatically set XEN_OS. (I have only tested the 32-bit build but I think the 64-bit build should work just as well.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: Add comment to `fi' v2: Mention x86_64. Drop an erroneous whitespace change. --- config/Tools.mk.in | 5 +++++ tools/configure | 11 +++++++++++ tools/configure.ac | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 852c941..748cc69 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -1,3 +1,8 @@ +CONFIG_RUMP := @CONFIG_RUMP@ +ifeq ($(CONFIG_RUMP),y) +XEN_OS := NetBSDRump +endif + # Prefix and install folder prefix := @prefix@ PREFIX := $(prefix) diff --git a/tools/configure b/tools/configure index 20f1aa9..a4aa8f1 100755 --- a/tools/configure +++ b/tools/configure @@ -706,6 +706,7 @@ CPPFLAGS LDFLAGS CFLAGS CC +CONFIG_RUMP host_os host_vendor host_cpu @@ -2323,6 +2324,12 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +case $host_vendor in +rumpxen) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; +esac + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6704,6 +6711,8 @@ LDLFAGS=$ac_previous_ldflags fi +if ! $rump; then + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8160,6 +8169,8 @@ fi done +fi # ! $rump + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/tools/configure.ac b/tools/configure.ac index 6d70f04..629d6a0 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -20,6 +20,12 @@ APPEND_INCLUDES and APPEND_LIB instead when possible.]) AC_CANONICAL_HOST +case $host_vendor in +rumpxen) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; +esac +AC_SUBST(CONFIG_RUMP) + AC_SYS_LARGEFILE case $ac_cv_sys_file_offset_bits in #( @@ -34,11 +40,11 @@ AC_SUBST(FILE_OFFSET_BITS) m4_include([../m4/savevar.m4]) m4_include([../m4/features.m4]) m4_include([../m4/path_or_fail.m4]) +m4_include([../m4/checkpolicy.m4]) +m4_include([../m4/set_cflags_ldflags.m4]) m4_include([../m4/python_version.m4]) m4_include([../m4/python_devel.m4]) m4_include([../m4/ocaml.m4]) -m4_include([../m4/checkpolicy.m4]) -m4_include([../m4/set_cflags_ldflags.m4]) m4_include([../m4/uuid.m4]) m4_include([../m4/pkg.m4]) m4_include([../m4/curses.m4]) @@ -233,6 +239,8 @@ AS_IF([test "$cross_compiling" != yes], [ AX_CHECK_PYTHON_DEVEL() ]) +if ! $rump; then + AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) dnl as86, ld86, bcc and iasl are only required when the host system is x86*. dnl "host" here means the platform on which the hypervisor and tools is @@ -287,5 +295,7 @@ esac # Checks for header files. AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h valgrind/memcheck.h utmp.h]) +fi # ! $rump + AC_OUTPUT() -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04:34: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 1X6uRq-000671-Tp; Tue, 15 Jul 2014 04:34:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRq-00066m-3e for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:38 +0000 Received: from [193.109.254.147:17590] by server-15.bemta-14.messagelabs.com id 49/01-11012-D5FA4C35; Tue, 15 Jul 2014 04:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1405398875!17427036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1090 invoked from network); 15 Jul 2014 04:34: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; 15 Jul 2014 04:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRn-00075Q-JQ for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRn-0006FX-Hs for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:35 +0000 Date: Tue, 15 Jul 2014 04:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rump kernels: Handle rumpxen host in configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 69ba39ec0501874f7fa028362c864d67ee29fadc Author: Ian Jackson AuthorDate: Wed May 28 17:04:52 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:50 2014 +0100 rump kernels: Handle rumpxen host in configure Support ./configure --host=x86_64-rumpxen-netbsd ./configure --host=i386-rumpxen-netbsd Setting --host tells configure we are cross compiling and therefore has various automatic effects. But in this patch we make some deliberate changes as well: * We disable a large number of configure tests for libraries etc. which don't exist. * We set CONFIG_RUMP in Tools.mk. * Hence, we automatically set XEN_OS. (I have only tested the 32-bit build but I think the 64-bit build should work just as well.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: Add comment to `fi' v2: Mention x86_64. Drop an erroneous whitespace change. --- config/Tools.mk.in | 5 +++++ tools/configure | 11 +++++++++++ tools/configure.ac | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 852c941..748cc69 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -1,3 +1,8 @@ +CONFIG_RUMP := @CONFIG_RUMP@ +ifeq ($(CONFIG_RUMP),y) +XEN_OS := NetBSDRump +endif + # Prefix and install folder prefix := @prefix@ PREFIX := $(prefix) diff --git a/tools/configure b/tools/configure index 20f1aa9..a4aa8f1 100755 --- a/tools/configure +++ b/tools/configure @@ -706,6 +706,7 @@ CPPFLAGS LDFLAGS CFLAGS CC +CONFIG_RUMP host_os host_vendor host_cpu @@ -2323,6 +2324,12 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +case $host_vendor in +rumpxen) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; +esac + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6704,6 +6711,8 @@ LDLFAGS=$ac_previous_ldflags fi +if ! $rump; then + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8160,6 +8169,8 @@ fi done +fi # ! $rump + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/tools/configure.ac b/tools/configure.ac index 6d70f04..629d6a0 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -20,6 +20,12 @@ APPEND_INCLUDES and APPEND_LIB instead when possible.]) AC_CANONICAL_HOST +case $host_vendor in +rumpxen) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; +esac +AC_SUBST(CONFIG_RUMP) + AC_SYS_LARGEFILE case $ac_cv_sys_file_offset_bits in #( @@ -34,11 +40,11 @@ AC_SUBST(FILE_OFFSET_BITS) m4_include([../m4/savevar.m4]) m4_include([../m4/features.m4]) m4_include([../m4/path_or_fail.m4]) +m4_include([../m4/checkpolicy.m4]) +m4_include([../m4/set_cflags_ldflags.m4]) m4_include([../m4/python_version.m4]) m4_include([../m4/python_devel.m4]) m4_include([../m4/ocaml.m4]) -m4_include([../m4/checkpolicy.m4]) -m4_include([../m4/set_cflags_ldflags.m4]) m4_include([../m4/uuid.m4]) m4_include([../m4/pkg.m4]) m4_include([../m4/curses.m4]) @@ -233,6 +239,8 @@ AS_IF([test "$cross_compiling" != yes], [ AX_CHECK_PYTHON_DEVEL() ]) +if ! $rump; then + AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) dnl as86, ld86, bcc and iasl are only required when the host system is x86*. dnl "host" here means the platform on which the hypervisor and tools is @@ -287,5 +295,7 @@ esac # Checks for header files. AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h valgrind/memcheck.h utmp.h]) +fi # ! $rump + AC_OUTPUT() -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uS2-00069C-0G; Tue, 15 Jul 2014 04: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 1X6uS0-00068t-De for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:48 +0000 Received: from [85.158.139.211:11169] by server-13.bemta-5.messagelabs.com id 5B/9E-17773-76FA4C35; Tue, 15 Jul 2014 04:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1405398886!15504308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3618 invoked from network); 15 Jul 2014 04:34:47 -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 Jul 2014 04:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRx-00075W-Pr for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRx-0006G5-ON for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:45 +0000 Date: Tue, 15 Jul 2014 04:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Makefile: Build only a subset of things for rump kernels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27b7b77f9ed9b1a8c56e591df0ab39aa4309a7a4 Author: Ian Jackson AuthorDate: Wed Jun 25 12:38:35 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:51 2014 +0100 tools/Makefile: Build only a subset of things for rump kernels Override the set of tools/ subdirectories for rump kernel builds. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index f4aa200..e558e6e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -43,6 +43,10 @@ SUBDIRS-y += pygrub SUBDIRS-$(OCAML_TOOLS) += ocaml endif +ifeq ($(CONFIG_RUMP),y) +SUBDIRS-y := include libxc xenstore +endif + # For the sake of linking, set the sys-root ifneq ($(CROSS_COMPILE),) CROSS_BIN_PATH ?= /usr/$(CROSS_COMPILE:-=)/bin -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 04:34:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 Jul 2014 04: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 1X6uS2-00069C-0G; Tue, 15 Jul 2014 04: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 1X6uS0-00068t-De for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:48 +0000 Received: from [85.158.139.211:11169] by server-13.bemta-5.messagelabs.com id 5B/9E-17773-76FA4C35; Tue, 15 Jul 2014 04:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1405398886!15504308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3618 invoked from network); 15 Jul 2014 04:34:47 -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 Jul 2014 04:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6uRx-00075W-Pr for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X6uRx-0006G5-ON for xen-changelog@lists.xensource.com; Tue, 15 Jul 2014 04:34:45 +0000 Date: Tue, 15 Jul 2014 04:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Makefile: Build only a subset of things for rump kernels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27b7b77f9ed9b1a8c56e591df0ab39aa4309a7a4 Author: Ian Jackson AuthorDate: Wed Jun 25 12:38:35 2014 +0100 Commit: Ian Jackson CommitDate: Mon Jul 14 16:07:51 2014 +0100 tools/Makefile: Build only a subset of things for rump kernels Override the set of tools/ subdirectories for rump kernel builds. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index f4aa200..e558e6e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -43,6 +43,10 @@ SUBDIRS-y += pygrub SUBDIRS-$(OCAML_TOOLS) += ocaml endif +ifeq ($(CONFIG_RUMP),y) +SUBDIRS-y := include libxc xenstore +endif + # For the sake of linking, set the sys-root ifneq ($(CROSS_COMPILE),) CROSS_BIN_PATH ?= /usr/$(CROSS_COMPILE:-=)/bin -- generated by git-patchbot for /home/xen/git/xen.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 Jul 17 02:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02:33: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 1X7bVL-00007o-M3; Thu, 17 Jul 2014 02: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 1X7bVK-00007a-94 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:06 +0000 Received: from [85.158.139.211:38870] by server-8.bemta-5.messagelabs.com id ED/24-25094-1E537C35; Thu, 17 Jul 2014 02:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1405564384!15940308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2522 invoked from network); 17 Jul 2014 02:33:05 -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; 17 Jul 2014 02:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVH-0002hS-PG for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVH-0003oV-5R for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:03 +0000 Date: Thu, 17 Jul 2014 02:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctrl: Make the headers C++ friendly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 374900d9f3c5d1596b27a6ec29014c9981be0714 Author: Razvan Cojocaru AuthorDate: Wed Jul 2 19:30:33 2014 +0300 Commit: Ian Campbell CommitDate: Wed Jul 16 14:37:39 2014 +0100 xenctrl: Make the headers C++ friendly Moved an enum definition before the typedef that uses it. Signed-off-by: Razvan Cojocaru Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xenctrl.h | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 3578b09..5beb846 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -119,6 +119,16 @@ typedef struct xc_interface_core xc_interface; typedef struct xc_interface_core xc_evtchn; typedef struct xc_interface_core xc_gnttab; typedef struct xc_interface_core xc_gntshr; + +enum xc_error_code { + XC_ERROR_NONE = 0, + XC_INTERNAL_ERROR = 1, + XC_INVALID_KERNEL = 2, + XC_INVALID_PARAM = 3, + XC_OUT_OF_MEMORY = 4, + /* new codes need to be added to xc_error_level_to_desc too */ +}; + typedef enum xc_error_code xc_error_code; @@ -1817,15 +1827,6 @@ int xc_hvm_inject_trap( */ -enum xc_error_code { - XC_ERROR_NONE = 0, - XC_INTERNAL_ERROR = 1, - XC_INVALID_KERNEL = 2, - XC_INVALID_PARAM = 3, - XC_OUT_OF_MEMORY = 4, - /* new codes need to be added to xc_error_level_to_desc too */ -}; - #define XC_MAX_ERROR_MSG_LEN 1024 typedef struct xc_error { enum xc_error_code 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 Thu Jul 17 02:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02:33: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 1X7bVL-00007o-M3; Thu, 17 Jul 2014 02: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 1X7bVK-00007a-94 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:06 +0000 Received: from [85.158.139.211:38870] by server-8.bemta-5.messagelabs.com id ED/24-25094-1E537C35; Thu, 17 Jul 2014 02:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1405564384!15940308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2522 invoked from network); 17 Jul 2014 02:33:05 -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; 17 Jul 2014 02:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVH-0002hS-PG for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVH-0003oV-5R for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:03 +0000 Date: Thu, 17 Jul 2014 02:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctrl: Make the headers C++ friendly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 374900d9f3c5d1596b27a6ec29014c9981be0714 Author: Razvan Cojocaru AuthorDate: Wed Jul 2 19:30:33 2014 +0300 Commit: Ian Campbell CommitDate: Wed Jul 16 14:37:39 2014 +0100 xenctrl: Make the headers C++ friendly Moved an enum definition before the typedef that uses it. Signed-off-by: Razvan Cojocaru Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xenctrl.h | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 3578b09..5beb846 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -119,6 +119,16 @@ typedef struct xc_interface_core xc_interface; typedef struct xc_interface_core xc_evtchn; typedef struct xc_interface_core xc_gnttab; typedef struct xc_interface_core xc_gntshr; + +enum xc_error_code { + XC_ERROR_NONE = 0, + XC_INTERNAL_ERROR = 1, + XC_INVALID_KERNEL = 2, + XC_INVALID_PARAM = 3, + XC_OUT_OF_MEMORY = 4, + /* new codes need to be added to xc_error_level_to_desc too */ +}; + typedef enum xc_error_code xc_error_code; @@ -1817,15 +1827,6 @@ int xc_hvm_inject_trap( */ -enum xc_error_code { - XC_ERROR_NONE = 0, - XC_INTERNAL_ERROR = 1, - XC_INVALID_KERNEL = 2, - XC_INVALID_PARAM = 3, - XC_OUT_OF_MEMORY = 4, - /* new codes need to be added to xc_error_level_to_desc too */ -}; - #define XC_MAX_ERROR_MSG_LEN 1024 typedef struct xc_error { enum xc_error_code 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 Thu Jul 17 02:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVV-00008q-Qu; Thu, 17 Jul 2014 02:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVU-00008c-J3 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:16 +0000 Received: from [85.158.143.35:25219] by server-2.bemta-4.messagelabs.com id 09/C6-26128-BE537C35; Thu, 17 Jul 2014 02:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1405564394!18182667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21808 invoked from network); 17 Jul 2014 02:33: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; 17 Jul 2014 02:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVS-0002hY-18 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVR-0003ov-Tw for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:13 +0000 Date: Thu, 17 Jul 2014 02:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm : Adding helper function for WFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c047211d2d61251a4735fd864009f6568cc041ec Author: Parth Dixit AuthorDate: Mon Jul 14 19:21:53 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 16 14:57:25 2014 +0100 xen/arm : Adding helper function for WFI WFI functionality is required at different places in xen. Moving it to seperate helper function so that it is easier to call WFI function and avoid duplication of code Signed-off-by: Parth Dixit Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 13 +++++++++++++ xen/arch/arm/traps.c | 10 +--------- xen/include/asm-arm/event.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 87902ef..2b53931 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -798,6 +798,19 @@ void vcpu_mark_events_pending(struct vcpu *v) vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } +/* The ARM spec declares that even if local irqs are masked in + * the CPSR register, an irq should wake up a cpu from WFI anyway. + * For this reason we need to check for irqs that need delivery, + * ignoring the CPSR register, *after* calling SCHEDOP_block to + * avoid races with vgic_vcpu_inject_irq. + */ +void vcpu_block_unless_event_pending(struct vcpu *v) +{ + vcpu_block(); + if ( local_events_need_delivery_nomask() ) + vcpu_unblock(current); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 686d8b7..5e4c837 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1804,15 +1804,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) return; } /* at the moment we only trap WFI */ - vcpu_block(); - /* The ARM spec declares that even if local irqs are masked in - * the CPSR register, an irq should wake up a cpu from WFI anyway. - * For this reason we need to check for irqs that need delivery, - * ignoring the CPSR register, *after* calling SCHEDOP_block to - * avoid races with vgic_vcpu_inject_irq. - */ - if ( local_events_need_delivery_nomask() ) - vcpu_unblock(current); + vcpu_block_unless_event_pending(current); advance_pc(regs, hsr); break; case HSR_EC_CP15_32: diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index dd3ad13..5330dfe 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -6,6 +6,7 @@ void vcpu_kick(struct vcpu *v); void vcpu_mark_events_pending(struct vcpu *v); +void vcpu_block_unless_event_pending(struct vcpu *v); static inline int vcpu_event_delivery_is_enabled(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 Jul 17 02:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVV-00008q-Qu; Thu, 17 Jul 2014 02:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVU-00008c-J3 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:16 +0000 Received: from [85.158.143.35:25219] by server-2.bemta-4.messagelabs.com id 09/C6-26128-BE537C35; Thu, 17 Jul 2014 02:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1405564394!18182667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21808 invoked from network); 17 Jul 2014 02:33: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; 17 Jul 2014 02:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVS-0002hY-18 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVR-0003ov-Tw for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:13 +0000 Date: Thu, 17 Jul 2014 02:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm : Adding helper function for WFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c047211d2d61251a4735fd864009f6568cc041ec Author: Parth Dixit AuthorDate: Mon Jul 14 19:21:53 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 16 14:57:25 2014 +0100 xen/arm : Adding helper function for WFI WFI functionality is required at different places in xen. Moving it to seperate helper function so that it is easier to call WFI function and avoid duplication of code Signed-off-by: Parth Dixit Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 13 +++++++++++++ xen/arch/arm/traps.c | 10 +--------- xen/include/asm-arm/event.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 87902ef..2b53931 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -798,6 +798,19 @@ void vcpu_mark_events_pending(struct vcpu *v) vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } +/* The ARM spec declares that even if local irqs are masked in + * the CPSR register, an irq should wake up a cpu from WFI anyway. + * For this reason we need to check for irqs that need delivery, + * ignoring the CPSR register, *after* calling SCHEDOP_block to + * avoid races with vgic_vcpu_inject_irq. + */ +void vcpu_block_unless_event_pending(struct vcpu *v) +{ + vcpu_block(); + if ( local_events_need_delivery_nomask() ) + vcpu_unblock(current); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 686d8b7..5e4c837 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1804,15 +1804,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) return; } /* at the moment we only trap WFI */ - vcpu_block(); - /* The ARM spec declares that even if local irqs are masked in - * the CPSR register, an irq should wake up a cpu from WFI anyway. - * For this reason we need to check for irqs that need delivery, - * ignoring the CPSR register, *after* calling SCHEDOP_block to - * avoid races with vgic_vcpu_inject_irq. - */ - if ( local_events_need_delivery_nomask() ) - vcpu_unblock(current); + vcpu_block_unless_event_pending(current); advance_pc(regs, hsr); break; case HSR_EC_CP15_32: diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index dd3ad13..5330dfe 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -6,6 +6,7 @@ void vcpu_kick(struct vcpu *v); void vcpu_mark_events_pending(struct vcpu *v); +void vcpu_block_unless_event_pending(struct vcpu *v); static inline int vcpu_event_delivery_is_enabled(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 Jul 17 02:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02: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 1X7bVg-0000AV-U2; Thu, 17 Jul 2014 02: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 1X7bVf-0000AM-Cc for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:27 +0000 Received: from [85.158.143.35:20363] by server-3.bemta-4.messagelabs.com id 12/00-09960-6F537C35; Thu, 17 Jul 2014 02:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405564404!17896809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_32, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14641 invoked from network); 17 Jul 2014 02:33:25 -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; 17 Jul 2014 02:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVc-0002he-Dg for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVc-0003pI-B4 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:24 +0000 Date: Thu, 17 Jul 2014 02:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Trap and yield on WFE instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af82c49116c7bf6857be6bf6b56094b9eb2ef012 Author: Anup Patel AuthorDate: Wed Jul 16 16:02:15 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 16 15:30:08 2014 +0100 xen/arm: Trap and yield on WFE instructions If we have a Guest/DomU with two or more of its VCPUs running on same host CPU then it can quite likely happen that these VCPUs fight for same spinlock and one of them will waste CPU cycles in WFE instruction. This patch makes WFE instruction trap for VCPU and forces VCPU to yield its timeslice. The KVM ARM/ARM64 also does similar thing for handling WFE instructions. (Please refer, https://lists.cs.columbia.edu/pipermail/kvmarm/2013-November/006259.html) In general, this patch is more of an optimization for an oversubscribed system having number of VCPUs more than underlying host CPUs. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Tested-by: Pranavkumar Sawargaonkar Acked-by: Ian Campbell [ ijc -- resolved conflict with "Adding helper function for WFI", nuked stray hard tab ] --- xen/arch/arm/traps.c | 11 ++++++++--- xen/include/asm-arm/processor.h | 9 +++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5e4c837..3dfabd0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -90,7 +90,7 @@ void __cpuinit init_traps(void) /* Setup hypervisor traps */ WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| - HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + HCR_TWE|HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); isb(); } @@ -1803,8 +1803,13 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); return; } - /* at the moment we only trap WFI */ - vcpu_block_unless_event_pending(current); + if ( hsr.wfi_wfe.ti ) { + /* Yield the VCPU for WFE */ + vcpu_force_reschedule(current); + } else { + /* Block the VCPU for WFI */ + vcpu_block_unless_event_pending(current); + } advance_pc(regs, hsr); break; case HSR_EC_CP15_32: diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index bdfff4e..9d230f3 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -276,6 +276,15 @@ union hsr { unsigned long ec:6; /* Exception Class */ } cond; + struct hsr_wfi_wfe { + unsigned long ti:1; /* Trapped instruction */ + unsigned long sbzp:19; + unsigned long cc:4; /* Condition Code */ + unsigned long ccvalid:1;/* CC Valid */ + unsigned long len:1; /* Instruction length */ + unsigned long ec:6; /* Exception Class */ + } wfi_wfe; + /* reg, reg0, reg1 are 4 bits on AArch32, the fifth bit is sbzp. */ struct hsr_cp32 { unsigned long read:1; /* Direction */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 17 02:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Jul 2014 02: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 1X7bVg-0000AV-U2; Thu, 17 Jul 2014 02: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 1X7bVf-0000AM-Cc for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:27 +0000 Received: from [85.158.143.35:20363] by server-3.bemta-4.messagelabs.com id 12/00-09960-6F537C35; Thu, 17 Jul 2014 02:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405564404!17896809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_32, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14641 invoked from network); 17 Jul 2014 02:33:25 -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; 17 Jul 2014 02:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7bVc-0002he-Dg for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X7bVc-0003pI-B4 for xen-changelog@lists.xensource.com; Thu, 17 Jul 2014 02:33:24 +0000 Date: Thu, 17 Jul 2014 02:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Trap and yield on WFE instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af82c49116c7bf6857be6bf6b56094b9eb2ef012 Author: Anup Patel AuthorDate: Wed Jul 16 16:02:15 2014 +0530 Commit: Ian Campbell CommitDate: Wed Jul 16 15:30:08 2014 +0100 xen/arm: Trap and yield on WFE instructions If we have a Guest/DomU with two or more of its VCPUs running on same host CPU then it can quite likely happen that these VCPUs fight for same spinlock and one of them will waste CPU cycles in WFE instruction. This patch makes WFE instruction trap for VCPU and forces VCPU to yield its timeslice. The KVM ARM/ARM64 also does similar thing for handling WFE instructions. (Please refer, https://lists.cs.columbia.edu/pipermail/kvmarm/2013-November/006259.html) In general, this patch is more of an optimization for an oversubscribed system having number of VCPUs more than underlying host CPUs. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Tested-by: Pranavkumar Sawargaonkar Acked-by: Ian Campbell [ ijc -- resolved conflict with "Adding helper function for WFI", nuked stray hard tab ] --- xen/arch/arm/traps.c | 11 ++++++++--- xen/include/asm-arm/processor.h | 9 +++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5e4c837..3dfabd0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -90,7 +90,7 @@ void __cpuinit init_traps(void) /* Setup hypervisor traps */ WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| - HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); + HCR_TWE|HCR_TWI|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP, HCR_EL2); isb(); } @@ -1803,8 +1803,13 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); return; } - /* at the moment we only trap WFI */ - vcpu_block_unless_event_pending(current); + if ( hsr.wfi_wfe.ti ) { + /* Yield the VCPU for WFE */ + vcpu_force_reschedule(current); + } else { + /* Block the VCPU for WFI */ + vcpu_block_unless_event_pending(current); + } advance_pc(regs, hsr); break; case HSR_EC_CP15_32: diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index bdfff4e..9d230f3 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -276,6 +276,15 @@ union hsr { unsigned long ec:6; /* Exception Class */ } cond; + struct hsr_wfi_wfe { + unsigned long ti:1; /* Trapped instruction */ + unsigned long sbzp:19; + unsigned long cc:4; /* Condition Code */ + unsigned long ccvalid:1;/* CC Valid */ + unsigned long len:1; /* Instruction length */ + unsigned long ec:6; /* Exception Class */ + } wfi_wfe; + /* reg, reg0, reg1 are 4 bits on AArch32, the fifth bit is sbzp. */ struct hsr_cp32 { unsigned long read:1; /* Direction */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfc-0006F7-Pk; Sat, 19 Jul 2014 09: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 1X8Qfc-0006Ez-6q for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:08 +0000 Received: from [85.158.137.68:6840] by server-1.bemta-3.messagelabs.com id 75/74-30185-B263AC35; Sat, 19 Jul 2014 09:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1405761064!16805609!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12636 invoked from network); 19 Jul 2014 09:11:05 -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; 19 Jul 2014 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QfX-0004ho-MR for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QfX-0003PP-Fx for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:03 +0000 Date: Sat, 19 Jul 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Check tools/qemu-xen[-traditional] for qemu before downloading X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffbf0893579be7904d4de4cd168de3defe416539 Author: George Dunlap AuthorDate: Mon Jul 14 17:15:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Check tools/qemu-xen[-traditional] for qemu before downloading Currently xen, qemu-xen, and qemu-xen-traditional are kept in separate repositories, but when we release them as a tarball, qemu-xen and qemu-xen-traditional are in-lined into the tools/ directory. In order to make this "just work", at the moment developer doing the release manually modifies Config.mk as part of the relase process so that CONFIG_QEMU and QEMU_UPSTREAM_URL point into the tools/ directory instead. Modify Config.mk to automatically check there before trying a remote repository. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index ab95b1c..a9b3468 100644 --- a/Config.mk +++ b/Config.mk @@ -224,6 +224,21 @@ else QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git endif +# Where to look for inlined subtrees (for example, from a tarball) +QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen +QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional + + +# Specify which qemu-dm to use. This may be `ioemu' to use the old +# Mercurial in-tree version, or a local directory, or a git URL. +# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git +CONFIG_QEMU ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_REMOTE)) + +ifneq (,$(wildcard $(QEMU_UPSTREAM_INTREE))) +QEMU_UPSTREAM_URL ?= $(QEMU_UPSTREAM_INTREE) +endif + ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git @@ -241,10 +256,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # Tue Apr 8 16:50:06 2014 +0000 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfc-0006F7-Pk; Sat, 19 Jul 2014 09: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 1X8Qfc-0006Ez-6q for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:08 +0000 Received: from [85.158.137.68:6840] by server-1.bemta-3.messagelabs.com id 75/74-30185-B263AC35; Sat, 19 Jul 2014 09:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1405761064!16805609!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12636 invoked from network); 19 Jul 2014 09:11:05 -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; 19 Jul 2014 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QfX-0004ho-MR for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QfX-0003PP-Fx for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:03 +0000 Date: Sat, 19 Jul 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Check tools/qemu-xen[-traditional] for qemu before downloading X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffbf0893579be7904d4de4cd168de3defe416539 Author: George Dunlap AuthorDate: Mon Jul 14 17:15:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Check tools/qemu-xen[-traditional] for qemu before downloading Currently xen, qemu-xen, and qemu-xen-traditional are kept in separate repositories, but when we release them as a tarball, qemu-xen and qemu-xen-traditional are in-lined into the tools/ directory. In order to make this "just work", at the moment developer doing the release manually modifies Config.mk as part of the relase process so that CONFIG_QEMU and QEMU_UPSTREAM_URL point into the tools/ directory instead. Modify Config.mk to automatically check there before trying a remote repository. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index ab95b1c..a9b3468 100644 --- a/Config.mk +++ b/Config.mk @@ -224,6 +224,21 @@ else QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git endif +# Where to look for inlined subtrees (for example, from a tarball) +QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen +QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional + + +# Specify which qemu-dm to use. This may be `ioemu' to use the old +# Mercurial in-tree version, or a local directory, or a git URL. +# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git +CONFIG_QEMU ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_REMOTE)) + +ifneq (,$(wildcard $(QEMU_UPSTREAM_INTREE))) +QEMU_UPSTREAM_URL ?= $(QEMU_UPSTREAM_INTREE) +endif + ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git @@ -241,10 +256,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # Tue Apr 8 16:50:06 2014 +0000 -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfn-0006Fm-ST; Sat, 19 Jul 2014 09:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfm-0006Fb-7a for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:18 +0000 Received: from [85.158.143.35:30929] by server-1.bemta-4.messagelabs.com id 78/A5-30046-5363AC35; Sat, 19 Jul 2014 09:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1405761075!18728651!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30031 invoked from network); 19 Jul 2014 09:11:16 -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; 19 Jul 2014 09:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfi-0004hr-UR for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qfi-0003Pq-Oq for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:14 +0000 Date: Sat, 19 Jul 2014 09:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Normalize config options for external trees X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8962a8f951ea83e8d10ee23aeb20266e4795b06e Author: George Dunlap AuthorDate: Mon Jul 14 17:15:23 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Normalize config options for external trees We have four different external trees, and four different naming conventions for specifying the URL, where they live, and what revision to check out. Normalize config options on the following bases: - QEMU_UPSTREAM - QEMU_TRADITIONAL - SEABIOS_UPSTREAM - OVMF_UPSTREAM The following suffixes for all trees: - _URL : A remote repository to clone from - _REVISION : The revision to check out And the following suffixes for the qemu trees: - _INTREE : The location of an inlined tree (for tarball releases) - _LOC : Where to actually look (either a directory or a URL) The following parameters are still supported for backwards compatibility: - CONFIG_QEMU (=> QEMU_TRADITIONAL_LOC) - QEMU_REMOTE (=> QEMU_TRADITIONAL_URL) - QEMU_TAG (=> QEMU_TRADITIONAL_REVISION) - SEABIOS_UPSTREAM_TAG (=> SEABIOS_UPSTREAM_REVISION) Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 43 +++++++++++++++++++++++++++---------------- tools/Makefile | 18 +++++++++--------- tools/firmware/Makefile | 6 +++--- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/Config.mk b/Config.mk index a9b3468..5370e23 100644 --- a/Config.mk +++ b/Config.mk @@ -218,49 +218,60 @@ XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. -ifeq ($(GIT_HTTP),y) -QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git -else -QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git -endif - # Where to look for inlined subtrees (for example, from a tarball) QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_REMOTE)) - -ifneq (,$(wildcard $(QEMU_UPSTREAM_INTREE))) -QEMU_UPSTREAM_URL ?= $(QEMU_UPSTREAM_INTREE) +# Handle legacy options +ifneq (,$(SEABIOS_UPSTREAM_TAG)) +SEABIOS_UPSTREAM_REVISION ?= $(SEABIOS_UPSTREAM_TAG) +endif +ifneq (,$(QEMU_REMOTE)) +QEMU_TRADITIONAL_URL ?= $(QEMU_REMOTE) +endif +ifneq (,$(CONFIG_QEMU)) +QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) +endif +ifneq (,$(QEMU_TAG)) +QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= master -SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 +SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 +QEMU_TRADITIONAL_REVISION ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads +# Specify which qemu-dm to use. This may be `ioemu' to use the old +# Mercurial in-tree version, or a local directory, or a git URL. +# QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git + +# Defaults for subtree locations +QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_TRADITIONAL_URL)) + +QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\ + $(QEMU_UPSTREAM_URL)) + # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. diff --git a/tools/Makefile b/tools/Makefile index e558e6e..0c4e49c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -111,35 +111,35 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \ --interp-prefix=$(CROSS_SYS_ROOT) endif -QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) +QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) ifneq ($(QEMU_ROOT),.) export QEMU_ROOT endif qemu-xen-traditional-dir-find: set -ex; \ - if test -d $(CONFIG_QEMU); then \ + if test -d $(QEMU_TRADITIONAL_LOC); then \ mkdir -p qemu-xen-traditional-dir; \ else \ export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) qemu-xen-traditional-dir; \ + $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \ fi qemu-xen-dir-find: - if test -d $(QEMU_UPSTREAM_URL) ; then \ + if test -d $(QEMU_UPSTREAM_LOC) ; then \ mkdir -p qemu-xen-dir; \ else \ export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_URL) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \ + $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_LOC) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \ fi .PHONY: qemu-xen-traditional-dir-force-update qemu-xen-traditional-dir-force-update: set -ex; \ - if [ "$(QEMU_TAG)" ]; then \ + if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ cd qemu-xen-traditional-dir-remote; \ $(GIT) fetch origin; \ - $(GIT) reset --hard $(QEMU_TAG); \ + $(GIT) reset --hard $(QEMU_TRADITIONAL_REVISION); \ fi subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find @@ -179,8 +179,8 @@ QEMU_XEN_ENABLE_DEBUG := endif subdir-all-qemu-xen-dir: qemu-xen-dir-find - if test -d $(QEMU_UPSTREAM_URL) ; then \ - source=$(QEMU_UPSTREAM_URL); \ + if test -d $(QEMU_UPSTREAM_LOC) ; then \ + source=$(QEMU_UPSTREAM_LOC); \ else \ source=.; \ fi; \ diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 2f1d10d..2c2ed34 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -24,7 +24,7 @@ ovmf-dir: cp ovmf-makefile ovmf-dir/Makefile; seabios-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir $(MAKE) -C seabios-dir defconfig .PHONY: all @@ -78,10 +78,10 @@ subdir-clean-ovmf: .PHONY: seabios-dir-force-update seabios-dir-force-update: set -ex; \ - if [ "$(SEABIOS_UPSTREAM_TAG)" ]; then \ + if [ "$(SEABIOS_UPSTREAM_REVISION)" ]; then \ cd seabios-dir-remote; \ $(GIT) fetch origin; \ - $(GIT) reset --hard $(SEABIOS_UPSTREAM_TAG); \ + $(GIT) reset --hard $(SEABIOS_UPSTREAM_REVISION); \ fi subdir-clean-seabios-dir: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfn-0006Fm-ST; Sat, 19 Jul 2014 09:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfm-0006Fb-7a for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:18 +0000 Received: from [85.158.143.35:30929] by server-1.bemta-4.messagelabs.com id 78/A5-30046-5363AC35; Sat, 19 Jul 2014 09:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1405761075!18728651!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30031 invoked from network); 19 Jul 2014 09:11:16 -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; 19 Jul 2014 09:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfi-0004hr-UR for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qfi-0003Pq-Oq for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:14 +0000 Date: Sat, 19 Jul 2014 09:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Normalize config options for external trees X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8962a8f951ea83e8d10ee23aeb20266e4795b06e Author: George Dunlap AuthorDate: Mon Jul 14 17:15:23 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Normalize config options for external trees We have four different external trees, and four different naming conventions for specifying the URL, where they live, and what revision to check out. Normalize config options on the following bases: - QEMU_UPSTREAM - QEMU_TRADITIONAL - SEABIOS_UPSTREAM - OVMF_UPSTREAM The following suffixes for all trees: - _URL : A remote repository to clone from - _REVISION : The revision to check out And the following suffixes for the qemu trees: - _INTREE : The location of an inlined tree (for tarball releases) - _LOC : Where to actually look (either a directory or a URL) The following parameters are still supported for backwards compatibility: - CONFIG_QEMU (=> QEMU_TRADITIONAL_LOC) - QEMU_REMOTE (=> QEMU_TRADITIONAL_URL) - QEMU_TAG (=> QEMU_TRADITIONAL_REVISION) - SEABIOS_UPSTREAM_TAG (=> SEABIOS_UPSTREAM_REVISION) Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 43 +++++++++++++++++++++++++++---------------- tools/Makefile | 18 +++++++++--------- tools/firmware/Makefile | 6 +++--- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/Config.mk b/Config.mk index a9b3468..5370e23 100644 --- a/Config.mk +++ b/Config.mk @@ -218,49 +218,60 @@ XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. -ifeq ($(GIT_HTTP),y) -QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git -else -QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git -endif - # Where to look for inlined subtrees (for example, from a tarball) QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_REMOTE)) - -ifneq (,$(wildcard $(QEMU_UPSTREAM_INTREE))) -QEMU_UPSTREAM_URL ?= $(QEMU_UPSTREAM_INTREE) +# Handle legacy options +ifneq (,$(SEABIOS_UPSTREAM_TAG)) +SEABIOS_UPSTREAM_REVISION ?= $(SEABIOS_UPSTREAM_TAG) +endif +ifneq (,$(QEMU_REMOTE)) +QEMU_TRADITIONAL_URL ?= $(QEMU_REMOTE) +endif +ifneq (,$(CONFIG_QEMU)) +QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) +endif +ifneq (,$(QEMU_TAG)) +QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= master -SEABIOS_UPSTREAM_TAG ?= rel-1.7.5 +SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 +QEMU_TRADITIONAL_REVISION ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads +# Specify which qemu-dm to use. This may be `ioemu' to use the old +# Mercurial in-tree version, or a local directory, or a git URL. +# QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git + +# Defaults for subtree locations +QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_TRADITIONAL_URL)) + +QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\ + $(QEMU_UPSTREAM_URL)) + # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. diff --git a/tools/Makefile b/tools/Makefile index e558e6e..0c4e49c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -111,35 +111,35 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \ --interp-prefix=$(CROSS_SYS_ROOT) endif -QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) +QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) ifneq ($(QEMU_ROOT),.) export QEMU_ROOT endif qemu-xen-traditional-dir-find: set -ex; \ - if test -d $(CONFIG_QEMU); then \ + if test -d $(QEMU_TRADITIONAL_LOC); then \ mkdir -p qemu-xen-traditional-dir; \ else \ export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) qemu-xen-traditional-dir; \ + $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \ fi qemu-xen-dir-find: - if test -d $(QEMU_UPSTREAM_URL) ; then \ + if test -d $(QEMU_UPSTREAM_LOC) ; then \ mkdir -p qemu-xen-dir; \ else \ export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_URL) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \ + $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_LOC) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \ fi .PHONY: qemu-xen-traditional-dir-force-update qemu-xen-traditional-dir-force-update: set -ex; \ - if [ "$(QEMU_TAG)" ]; then \ + if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ cd qemu-xen-traditional-dir-remote; \ $(GIT) fetch origin; \ - $(GIT) reset --hard $(QEMU_TAG); \ + $(GIT) reset --hard $(QEMU_TRADITIONAL_REVISION); \ fi subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find @@ -179,8 +179,8 @@ QEMU_XEN_ENABLE_DEBUG := endif subdir-all-qemu-xen-dir: qemu-xen-dir-find - if test -d $(QEMU_UPSTREAM_URL) ; then \ - source=$(QEMU_UPSTREAM_URL); \ + if test -d $(QEMU_UPSTREAM_LOC) ; then \ + source=$(QEMU_UPSTREAM_LOC); \ else \ source=.; \ fi; \ diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 2f1d10d..2c2ed34 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -24,7 +24,7 @@ ovmf-dir: cp ovmf-makefile ovmf-dir/Makefile; seabios-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir $(MAKE) -C seabios-dir defconfig .PHONY: all @@ -78,10 +78,10 @@ subdir-clean-ovmf: .PHONY: seabios-dir-force-update seabios-dir-force-update: set -ex; \ - if [ "$(SEABIOS_UPSTREAM_TAG)" ]; then \ + if [ "$(SEABIOS_UPSTREAM_REVISION)" ]; then \ cd seabios-dir-remote; \ $(GIT) fetch origin; \ - $(GIT) reset --hard $(SEABIOS_UPSTREAM_TAG); \ + $(GIT) reset --hard $(SEABIOS_UPSTREAM_REVISION); \ fi subdir-clean-seabios-dir: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfw-0006Gw-VG; Sat, 19 Jul 2014 09:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfw-0006Gn-7Q for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:28 +0000 Received: from [85.158.143.35:2576] by server-3.bemta-4.messagelabs.com id F6/44-09960-F363AC35; Sat, 19 Jul 2014 09:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405761085!11428379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23835 invoked from network); 19 Jul 2014 09:11:26 -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; 19 Jul 2014 09:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qft-0004i0-9E for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qft-0003QD-1W for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:25 +0000 Date: Sat, 19 Jul 2014 09:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Make *-dir-force-update depend on *-dir-find X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ae93d3db81447c101b7fd7af0dc61a53246cbd3 Author: George Dunlap AuthorDate: Mon Jul 14 17:15:24 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Make *-dir-force-update depend on *-dir-find Make the targets depend on the "-find" targets, so that if the subtrees are cloned if they haven't been cloned already. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- tools/Makefile | 4 ++-- tools/firmware/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0c4e49c..b6476c9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -134,7 +134,7 @@ qemu-xen-dir-find: fi .PHONY: qemu-xen-traditional-dir-force-update -qemu-xen-traditional-dir-force-update: +qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find set -ex; \ if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ cd qemu-xen-traditional-dir-remote; \ @@ -164,7 +164,7 @@ subdir-clean-qemu-xen-traditional-dir: fi .PHONY: qemu-xen-dir-force-update -qemu-xen-dir-force-update: +qemu-xen-dir-force-update: qemu-xen-dir-find set -ex; \ if [ "$(QEMU_UPSTREAM_REVISION)" ]; then \ cd qemu-xen-dir-remote; \ diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 2c2ed34..660bacb 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -62,7 +62,7 @@ subdir-distclean-seabios-dir: .phony rm -rf seabios-dir seabios-dir-remote .PHONY: ovmf-dir-force-update -ovmf-dir-force-update: +ovmf-dir-force-update: ovmf-dir set -ex; \ if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \ cd ovmf-dir-remote; \ @@ -76,7 +76,7 @@ subdir-clean-ovmf: fi .PHONY: seabios-dir-force-update -seabios-dir-force-update: +seabios-dir-force-update: seabios-dir set -ex; \ if [ "$(SEABIOS_UPSTREAM_REVISION)" ]; then \ cd seabios-dir-remote; \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:11: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 1X8Qfw-0006Gw-VG; Sat, 19 Jul 2014 09:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qfw-0006Gn-7Q for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:28 +0000 Received: from [85.158.143.35:2576] by server-3.bemta-4.messagelabs.com id F6/44-09960-F363AC35; Sat, 19 Jul 2014 09:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405761085!11428379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23835 invoked from network); 19 Jul 2014 09:11:26 -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; 19 Jul 2014 09:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qft-0004i0-9E for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qft-0003QD-1W for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:25 +0000 Date: Sat, 19 Jul 2014 09:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make: Make *-dir-force-update depend on *-dir-find X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ae93d3db81447c101b7fd7af0dc61a53246cbd3 Author: George Dunlap AuthorDate: Mon Jul 14 17:15:24 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 11:20:56 2014 +0100 make: Make *-dir-force-update depend on *-dir-find Make the targets depend on the "-find" targets, so that if the subtrees are cloned if they haven't been cloned already. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- tools/Makefile | 4 ++-- tools/firmware/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0c4e49c..b6476c9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -134,7 +134,7 @@ qemu-xen-dir-find: fi .PHONY: qemu-xen-traditional-dir-force-update -qemu-xen-traditional-dir-force-update: +qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find set -ex; \ if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ cd qemu-xen-traditional-dir-remote; \ @@ -164,7 +164,7 @@ subdir-clean-qemu-xen-traditional-dir: fi .PHONY: qemu-xen-dir-force-update -qemu-xen-dir-force-update: +qemu-xen-dir-force-update: qemu-xen-dir-find set -ex; \ if [ "$(QEMU_UPSTREAM_REVISION)" ]; then \ cd qemu-xen-dir-remote; \ diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 2c2ed34..660bacb 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -62,7 +62,7 @@ subdir-distclean-seabios-dir: .phony rm -rf seabios-dir seabios-dir-remote .PHONY: ovmf-dir-force-update -ovmf-dir-force-update: +ovmf-dir-force-update: ovmf-dir set -ex; \ if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \ cd ovmf-dir-remote; \ @@ -76,7 +76,7 @@ subdir-clean-ovmf: fi .PHONY: seabios-dir-force-update -seabios-dir-force-update: +seabios-dir-force-update: seabios-dir set -ex; \ if [ "$(SEABIOS_UPSTREAM_REVISION)" ]; then \ cd seabios-dir-remote; \ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qg7-0006IH-1e; Sat, 19 Jul 2014 09:11:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qg6-0006I4-29 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:38 +0000 Received: from [85.158.143.35:33901] by server-2.bemta-4.messagelabs.com id C2/10-26128-9463AC35; Sat, 19 Jul 2014 09:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405761095!18417091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15282 invoked from network); 19 Jul 2014 09:11:36 -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 Jul 2014 09:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qg3-0004i8-G9 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qg3-0003RH-CC for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:35 +0000 Date: Sat, 19 Jul 2014 09:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: 'xl vncviewer' accesses port 0 by any invalid domid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a8cc1a55329ead252ed323ec4bbee534d5c0f23 Author: Chunyan Liu AuthorDate: Fri Jul 18 14:18:04 2014 +0800 Commit: Ian Campbell CommitDate: Fri Jul 18 13:37:47 2014 +0100 xl: 'xl vncviewer' accesses port 0 by any invalid domid Currently, with command: xl vncviewer invalid_domid it always brings user to the domU using vncport 5900. The invalid domid could be an non-existing one or Dom0. It's better to report error in this case. Correct libxl_vncviewer_exec: In existing code, when vncport is NULL, it still continues and will show vncport 5900. So, with 'xl vncviewer 0' it also wrongly shows domU using vncport 5900. Correct it to report error if vncport is NULL. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a9205d1..3526539 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1719,8 +1719,12 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) vnc_port = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/console/vnc-port", domid)); - if ( vnc_port ) - port = atoi(vnc_port) - 5900; + if (!vnc_port) { + LOG(ERROR, "Cannot get vnc-port of domain %d", domid); + goto x_fail; + } + + port = atoi(vnc_port) - 5900; vnc_listen = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qg7-0006IH-1e; Sat, 19 Jul 2014 09:11:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qg6-0006I4-29 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:38 +0000 Received: from [85.158.143.35:33901] by server-2.bemta-4.messagelabs.com id C2/10-26128-9463AC35; Sat, 19 Jul 2014 09:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405761095!18417091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15282 invoked from network); 19 Jul 2014 09:11:36 -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 Jul 2014 09:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qg3-0004i8-G9 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qg3-0003RH-CC for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:35 +0000 Date: Sat, 19 Jul 2014 09:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: 'xl vncviewer' accesses port 0 by any invalid domid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a8cc1a55329ead252ed323ec4bbee534d5c0f23 Author: Chunyan Liu AuthorDate: Fri Jul 18 14:18:04 2014 +0800 Commit: Ian Campbell CommitDate: Fri Jul 18 13:37:47 2014 +0100 xl: 'xl vncviewer' accesses port 0 by any invalid domid Currently, with command: xl vncviewer invalid_domid it always brings user to the domU using vncport 5900. The invalid domid could be an non-existing one or Dom0. It's better to report error in this case. Correct libxl_vncviewer_exec: In existing code, when vncport is NULL, it still continues and will show vncport 5900. So, with 'xl vncviewer 0' it also wrongly shows domU using vncport 5900. Correct it to report error if vncport is NULL. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a9205d1..3526539 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1719,8 +1719,12 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) vnc_port = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/console/vnc-port", domid)); - if ( vnc_port ) - port = atoi(vnc_port) - 5900; + if (!vnc_port) { + LOG(ERROR, "Cannot get vnc-port of domain %d", domid); + goto x_fail; + } + + port = atoi(vnc_port) - 5900; vnc_listen = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09: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 1X8QgI-0006Jo-4c; Sat, 19 Jul 2014 09:11:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgG-0006JV-Oi for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:48 +0000 Received: from [193.109.254.147:25099] by server-3.bemta-14.messagelabs.com id 51/D8-23707-4563AC35; Sat, 19 Jul 2014 09:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1405761105!15047811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14121 invoked from network); 19 Jul 2014 09:11:46 -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; 19 Jul 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 1X8QgD-0004iE-Ku for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgD-0003Rn-Jv for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:45 +0000 Date: Sat, 19 Jul 2014 09:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: let map_mmio_regions() take pfn as parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59bb589096a637ce02fd88559c759641801d7fa6 Author: Arianna Avanzini AuthorDate: Mon Jul 14 02:50:23 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 arch/arm: let map_mmio_regions() take pfn as parameters Currently, the map_mmio_regions() function, defined for the ARM architecture, has parameters with paddr_t type. This interface, however, needs caller functions to correctly page-align addresses given as parameters to map_mmio_regions(). This commit changes the function's interface to accept page frame numbers as parameters. This commit also modifies caller functions in an attempt to adapt them to the new interface. This commit is meant to produce the minimum indispensable needed changes; these are also instrumental to making the interface of map_mmio_regions() symmetric with the unmap_mmio_regions() function, that will be introduced in one of the next commits of the series and will feature a pfn-based interface. NOTE: platform-specific code has not been tested, save for the sunxi and the Arndale Exynos 5 platforms (see the Tested-by below for the latter). Signed-off-by: Arianna Avanzini Tested-by: Julien Grall Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik --- xen/arch/arm/domain_build.c | 7 ++++--- xen/arch/arm/gic-v2.c | 20 +++++++++++--------- xen/arch/arm/p2m.c | 13 ++++++++----- xen/arch/arm/platforms/exynos5.c | 11 ++++++----- xen/arch/arm/platforms/omap5.c | 21 ++++++++++++--------- xen/arch/arm/platforms/xgene-storm.c | 4 +++- xen/include/asm-arm/mm.h | 2 ++ xen/include/asm-arm/p2m.h | 11 ++++++----- 8 files changed, 52 insertions(+), 37 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 69188a4..f150933 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1018,9 +1018,10 @@ static int map_device(struct domain *d, struct dt_device_node *dev) addr & PAGE_MASK, PAGE_ALIGN(addr + size) - 1); return res; } - res = map_mmio_regions(d, addr & PAGE_MASK, - PAGE_ALIGN(addr + size) - 1, - addr & PAGE_MASK); + res = map_mmio_regions(d, + paddr_to_pfn(addr & PAGE_MASK), + paddr_to_pfn_aligned(addr + size), + paddr_to_pfn(addr & PAGE_MASK)); if ( res ) { printk(XENLOG_ERR "Unable to map 0x%"PRIx64 diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 843f5a1..8db5cd8 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -440,20 +440,22 @@ static int gicv2v_setup(struct domain *d) * The second page is always mapped at +4K irrespective of the * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. */ - ret = map_mmio_regions(d, d->arch.vgic.cbase, - d->arch.vgic.cbase + PAGE_SIZE - 1, - gicv2.vbase); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), + paddr_to_pfn_aligned(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn(gicv2.vbase)); if ( ret ) return ret; if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gicv2.vbase + PAGE_SIZE); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn_aligned(d->arch.vgic.cbase + + (2 * PAGE_SIZE)), + paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); else - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gicv2.vbase + 16*PAGE_SIZE); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn_aligned(d->arch.vgic.cbase + + (2 * PAGE_SIZE)), + paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); return ret; } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c0c011a..7364eaa 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -813,12 +813,15 @@ int p2m_populate_ram(struct domain *d, } int map_mmio_regions(struct domain *d, - paddr_t start_gaddr, - paddr_t end_gaddr, - paddr_t maddr) + unsigned long start_gfn, + unsigned long end_gfn, + unsigned long mfn) { - return apply_p2m_changes(d, INSERT, start_gaddr, end_gaddr, - maddr, MATTR_DEV, p2m_mmio_direct); + return apply_p2m_changes(d, INSERT, + pfn_to_paddr(start_gfn), + pfn_to_paddr(end_gfn), + pfn_to_paddr(mfn), + MATTR_DEV, p2m_mmio_direct); } int guest_physmap_add_entry(struct domain *d, diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 65e584f..078b020 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -54,13 +54,14 @@ static int exynos5_init_time(void) static int exynos5_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, EXYNOS5_PA_CHIPID, EXYNOS5_PA_CHIPID + PAGE_SIZE - 1, - EXYNOS5_PA_CHIPID); + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), + paddr_to_pfn_aligned(EXYNOS5_PA_CHIPID + PAGE_SIZE), + paddr_to_pfn(EXYNOS5_PA_CHIPID)); /* Map the PWM region */ - map_mmio_regions(d, EXYNOS5_PA_TIMER, - EXYNOS5_PA_TIMER + (PAGE_SIZE * 2) - 1, - EXYNOS5_PA_TIMER); + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), + paddr_to_pfn_aligned(EXYNOS5_PA_TIMER + (PAGE_SIZE * 2)), + paddr_to_pfn(EXYNOS5_PA_TIMER)); return 0; } diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index c0f8537..16acd0c 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -102,21 +102,24 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, OMAP5_PRM_BASE, OMAP5_PRM_BASE + (PAGE_SIZE * 2) - 1, - OMAP5_PRM_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), + paddr_to_pfn_aligned(OMAP5_PRM_BASE + (PAGE_SIZE * 2)), + paddr_to_pfn(OMAP5_PRM_BASE)); /* Map the PRM_MPU */ - map_mmio_regions(d, OMAP5_PRCM_MPU_BASE, - OMAP5_PRCM_MPU_BASE + PAGE_SIZE - 1, - OMAP5_PRCM_MPU_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), + paddr_to_pfn_aligned(OMAP5_PRCM_MPU_BASE + PAGE_SIZE), + paddr_to_pfn(OMAP5_PRCM_MPU_BASE)); /* Map the Wakeup Gen */ - map_mmio_regions(d, OMAP5_WKUPGEN_BASE, OMAP5_WKUPGEN_BASE + PAGE_SIZE - 1, - OMAP5_WKUPGEN_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), + paddr_to_pfn_aligned(OMAP5_WKUPGEN_BASE + PAGE_SIZE), + paddr_to_pfn(OMAP5_WKUPGEN_BASE)); /* Map the on-chip SRAM */ - map_mmio_regions(d, OMAP5_SRAM_PA, OMAP5_SRAM_PA + (PAGE_SIZE * 32) - 1, - OMAP5_SRAM_PA); + map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), + paddr_to_pfn_aligned(OMAP5_SRAM_PA + (PAGE_SIZE * 32)), + paddr_to_pfn(OMAP5_SRAM_PA)); return 0; } diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 837d8e6..e50b916 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -47,7 +47,9 @@ static int map_one_mmio(struct domain *d, const char *what, printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", start, end, what); - ret = map_mmio_regions(d, start, end, start); + ret = map_mmio_regions(d, paddr_to_pfn(start), + paddr_to_pfn_aligned(end), + paddr_to_pfn(start)); if ( ret ) printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", what, start, d->domain_id); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 2552d34..9fa80a4 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -210,6 +210,8 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +/* Page-align address and convert to frame number format */ +#define paddr_to_pfn_aligned(paddr) paddr_to_pfn(PAGE_ALIGN(paddr)) static inline paddr_t __virt_to_maddr(vaddr_t va) { diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 327a79d..eea9c55 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -99,11 +99,12 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gaddr and end_gaddr is the range - * in the guest physical address space to map, starting from the machine - * address maddr. */ -int map_mmio_regions(struct domain *d, paddr_t start_gaddr, - paddr_t end_gaddr, paddr_t maddr); +/* Map MMIO regions in the p2m: start_gfn and end_gfn is the range in the guest + * physical address space to map, starting from the machine frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long end_gfn, + unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09: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 1X8QgI-0006Jo-4c; Sat, 19 Jul 2014 09:11:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgG-0006JV-Oi for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:48 +0000 Received: from [193.109.254.147:25099] by server-3.bemta-14.messagelabs.com id 51/D8-23707-4563AC35; Sat, 19 Jul 2014 09:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1405761105!15047811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14121 invoked from network); 19 Jul 2014 09:11:46 -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; 19 Jul 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 1X8QgD-0004iE-Ku for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgD-0003Rn-Jv for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:45 +0000 Date: Sat, 19 Jul 2014 09:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: let map_mmio_regions() take pfn as parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59bb589096a637ce02fd88559c759641801d7fa6 Author: Arianna Avanzini AuthorDate: Mon Jul 14 02:50:23 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 arch/arm: let map_mmio_regions() take pfn as parameters Currently, the map_mmio_regions() function, defined for the ARM architecture, has parameters with paddr_t type. This interface, however, needs caller functions to correctly page-align addresses given as parameters to map_mmio_regions(). This commit changes the function's interface to accept page frame numbers as parameters. This commit also modifies caller functions in an attempt to adapt them to the new interface. This commit is meant to produce the minimum indispensable needed changes; these are also instrumental to making the interface of map_mmio_regions() symmetric with the unmap_mmio_regions() function, that will be introduced in one of the next commits of the series and will feature a pfn-based interface. NOTE: platform-specific code has not been tested, save for the sunxi and the Arndale Exynos 5 platforms (see the Tested-by below for the latter). Signed-off-by: Arianna Avanzini Tested-by: Julien Grall Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik --- xen/arch/arm/domain_build.c | 7 ++++--- xen/arch/arm/gic-v2.c | 20 +++++++++++--------- xen/arch/arm/p2m.c | 13 ++++++++----- xen/arch/arm/platforms/exynos5.c | 11 ++++++----- xen/arch/arm/platforms/omap5.c | 21 ++++++++++++--------- xen/arch/arm/platforms/xgene-storm.c | 4 +++- xen/include/asm-arm/mm.h | 2 ++ xen/include/asm-arm/p2m.h | 11 ++++++----- 8 files changed, 52 insertions(+), 37 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 69188a4..f150933 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1018,9 +1018,10 @@ static int map_device(struct domain *d, struct dt_device_node *dev) addr & PAGE_MASK, PAGE_ALIGN(addr + size) - 1); return res; } - res = map_mmio_regions(d, addr & PAGE_MASK, - PAGE_ALIGN(addr + size) - 1, - addr & PAGE_MASK); + res = map_mmio_regions(d, + paddr_to_pfn(addr & PAGE_MASK), + paddr_to_pfn_aligned(addr + size), + paddr_to_pfn(addr & PAGE_MASK)); if ( res ) { printk(XENLOG_ERR "Unable to map 0x%"PRIx64 diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 843f5a1..8db5cd8 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -440,20 +440,22 @@ static int gicv2v_setup(struct domain *d) * The second page is always mapped at +4K irrespective of the * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. */ - ret = map_mmio_regions(d, d->arch.vgic.cbase, - d->arch.vgic.cbase + PAGE_SIZE - 1, - gicv2.vbase); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), + paddr_to_pfn_aligned(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn(gicv2.vbase)); if ( ret ) return ret; if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gicv2.vbase + PAGE_SIZE); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn_aligned(d->arch.vgic.cbase + + (2 * PAGE_SIZE)), + paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); else - ret = map_mmio_regions(d, d->arch.vgic.cbase + PAGE_SIZE, - d->arch.vgic.cbase + (2 * PAGE_SIZE) - 1, - gicv2.vbase + 16*PAGE_SIZE); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + paddr_to_pfn_aligned(d->arch.vgic.cbase + + (2 * PAGE_SIZE)), + paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); return ret; } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c0c011a..7364eaa 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -813,12 +813,15 @@ int p2m_populate_ram(struct domain *d, } int map_mmio_regions(struct domain *d, - paddr_t start_gaddr, - paddr_t end_gaddr, - paddr_t maddr) + unsigned long start_gfn, + unsigned long end_gfn, + unsigned long mfn) { - return apply_p2m_changes(d, INSERT, start_gaddr, end_gaddr, - maddr, MATTR_DEV, p2m_mmio_direct); + return apply_p2m_changes(d, INSERT, + pfn_to_paddr(start_gfn), + pfn_to_paddr(end_gfn), + pfn_to_paddr(mfn), + MATTR_DEV, p2m_mmio_direct); } int guest_physmap_add_entry(struct domain *d, diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 65e584f..078b020 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -54,13 +54,14 @@ static int exynos5_init_time(void) static int exynos5_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, EXYNOS5_PA_CHIPID, EXYNOS5_PA_CHIPID + PAGE_SIZE - 1, - EXYNOS5_PA_CHIPID); + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), + paddr_to_pfn_aligned(EXYNOS5_PA_CHIPID + PAGE_SIZE), + paddr_to_pfn(EXYNOS5_PA_CHIPID)); /* Map the PWM region */ - map_mmio_regions(d, EXYNOS5_PA_TIMER, - EXYNOS5_PA_TIMER + (PAGE_SIZE * 2) - 1, - EXYNOS5_PA_TIMER); + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), + paddr_to_pfn_aligned(EXYNOS5_PA_TIMER + (PAGE_SIZE * 2)), + paddr_to_pfn(EXYNOS5_PA_TIMER)); return 0; } diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index c0f8537..16acd0c 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -102,21 +102,24 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, OMAP5_PRM_BASE, OMAP5_PRM_BASE + (PAGE_SIZE * 2) - 1, - OMAP5_PRM_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), + paddr_to_pfn_aligned(OMAP5_PRM_BASE + (PAGE_SIZE * 2)), + paddr_to_pfn(OMAP5_PRM_BASE)); /* Map the PRM_MPU */ - map_mmio_regions(d, OMAP5_PRCM_MPU_BASE, - OMAP5_PRCM_MPU_BASE + PAGE_SIZE - 1, - OMAP5_PRCM_MPU_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), + paddr_to_pfn_aligned(OMAP5_PRCM_MPU_BASE + PAGE_SIZE), + paddr_to_pfn(OMAP5_PRCM_MPU_BASE)); /* Map the Wakeup Gen */ - map_mmio_regions(d, OMAP5_WKUPGEN_BASE, OMAP5_WKUPGEN_BASE + PAGE_SIZE - 1, - OMAP5_WKUPGEN_BASE); + map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), + paddr_to_pfn_aligned(OMAP5_WKUPGEN_BASE + PAGE_SIZE), + paddr_to_pfn(OMAP5_WKUPGEN_BASE)); /* Map the on-chip SRAM */ - map_mmio_regions(d, OMAP5_SRAM_PA, OMAP5_SRAM_PA + (PAGE_SIZE * 32) - 1, - OMAP5_SRAM_PA); + map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), + paddr_to_pfn_aligned(OMAP5_SRAM_PA + (PAGE_SIZE * 32)), + paddr_to_pfn(OMAP5_SRAM_PA)); return 0; } diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 837d8e6..e50b916 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -47,7 +47,9 @@ static int map_one_mmio(struct domain *d, const char *what, printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", start, end, what); - ret = map_mmio_regions(d, start, end, start); + ret = map_mmio_regions(d, paddr_to_pfn(start), + paddr_to_pfn_aligned(end), + paddr_to_pfn(start)); if ( ret ) printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", what, start, d->domain_id); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 2552d34..9fa80a4 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -210,6 +210,8 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +/* Page-align address and convert to frame number format */ +#define paddr_to_pfn_aligned(paddr) paddr_to_pfn(PAGE_ALIGN(paddr)) static inline paddr_t __virt_to_maddr(vaddr_t va) { diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 327a79d..eea9c55 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -99,11 +99,12 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gaddr and end_gaddr is the range - * in the guest physical address space to map, starting from the machine - * address maddr. */ -int map_mmio_regions(struct domain *d, paddr_t start_gaddr, - paddr_t end_gaddr, paddr_t maddr); +/* Map MMIO regions in the p2m: start_gfn and end_gfn is the range in the guest + * physical address space to map, starting from the machine frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long end_gfn, + unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:12:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8QgS-0006M1-9X; Sat, 19 Jul 2014 09:12:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgR-0006Li-03 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:59 +0000 Received: from [85.158.143.35:35031] by server-3.bemta-4.messagelabs.com id 8E/64-09960-E563AC35; Sat, 19 Jul 2014 09:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405761116!11428429!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25329 invoked from network); 19 Jul 2014 09:11:56 -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; 19 Jul 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 1X8QgN-0004iN-Pn for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgN-0003S9-Nw for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:55 +0000 Date: Sat, 19 Jul 2014 09:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: let map_mmio_regions() use start and count X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88c10b0d6eeea50302fa276ec78ac0ded393a979 Author: Arianna Avanzini AuthorDate: Mon Jul 14 02:50:24 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 arch/arm: let map_mmio_regions() use start and count Currently, the arguments given to the function map_mmio_regions() to describe the memory range to be mapped are the start and end page frame numbers of the range to be mapped. However, this could give rise to issues due to the range being inclusive or exclusive of the end gfn given as parameter. This commit changes the interface of the function to accept the start gfn and the number of gfns to be mapped. This commit also changes the interface of the function map_one_mmio(), helper for the xgene-storm platform, which is a wrapper for the function map_mmio_regions() and does not need its arguments to be paddr_t. NOTE: platform-specific code has not been tested, save for the sunxi and the Arndale Exynos 5 platforms (see the Tested-by below for the latter). Signed-off-by: Arianna Avanzini Acked-by: Julien Grall Acked-by: Ian Campbell Tested-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik [ ijc -- remove stray extra parameter in xgene-storm.c ] --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/gic-v2.c | 13 ++++--------- xen/arch/arm/p2m.c | 4 ++-- xen/arch/arm/platforms/exynos5.c | 6 ++---- xen/arch/arm/platforms/omap5.c | 12 ++++-------- xen/arch/arm/platforms/xgene-storm.c | 18 ++++++++++-------- xen/include/asm-arm/p2m.h | 7 ++++--- 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f150933..c58ad75 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1020,7 +1020,7 @@ static int map_device(struct domain *d, struct dt_device_node *dev) } res = map_mmio_regions(d, paddr_to_pfn(addr & PAGE_MASK), - paddr_to_pfn_aligned(addr + size), + DIV_ROUND_UP(size, PAGE_SIZE), paddr_to_pfn(addr & PAGE_MASK)); if ( res ) { diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 8db5cd8..1305542 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -440,22 +440,17 @@ static int gicv2v_setup(struct domain *d) * The second page is always mapped at +4K irrespective of the * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. */ - ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), - paddr_to_pfn_aligned(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn(gicv2.vbase)); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), 1, + paddr_to_pfn(gicv2.vbase)); if ( ret ) return ret; if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn_aligned(d->arch.vgic.cbase + - (2 * PAGE_SIZE)), - paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); + 2, paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn_aligned(d->arch.vgic.cbase + - (2 * PAGE_SIZE)), - paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); + 2, paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); return ret; } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 7364eaa..69029f4 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -814,12 +814,12 @@ int p2m_populate_ram(struct domain *d, int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long end_gfn, + unsigned long nr_mfns, unsigned long mfn) { return apply_p2m_changes(d, INSERT, pfn_to_paddr(start_gfn), - pfn_to_paddr(end_gfn), + pfn_to_paddr(start_gfn + nr_mfns), pfn_to_paddr(mfn), MATTR_DEV, p2m_mmio_direct); } diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 078b020..b65c2c2 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -54,13 +54,11 @@ static int exynos5_init_time(void) static int exynos5_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), - paddr_to_pfn_aligned(EXYNOS5_PA_CHIPID + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), 1, paddr_to_pfn(EXYNOS5_PA_CHIPID)); /* Map the PWM region */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), - paddr_to_pfn_aligned(EXYNOS5_PA_TIMER + (PAGE_SIZE * 2)), + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), 2, paddr_to_pfn(EXYNOS5_PA_TIMER)); return 0; diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 16acd0c..9d6e504 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -102,23 +102,19 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), - paddr_to_pfn_aligned(OMAP5_PRM_BASE + (PAGE_SIZE * 2)), + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), 2, paddr_to_pfn(OMAP5_PRM_BASE)); /* Map the PRM_MPU */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), - paddr_to_pfn_aligned(OMAP5_PRCM_MPU_BASE + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), 1, paddr_to_pfn(OMAP5_PRCM_MPU_BASE)); /* Map the Wakeup Gen */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), - paddr_to_pfn_aligned(OMAP5_WKUPGEN_BASE + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), 1, paddr_to_pfn(OMAP5_WKUPGEN_BASE)); /* Map the on-chip SRAM */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), - paddr_to_pfn_aligned(OMAP5_SRAM_PA + (PAGE_SIZE * 32)), + map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), 32, paddr_to_pfn(OMAP5_SRAM_PA)); return 0; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index e50b916..29c4752 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -41,15 +41,13 @@ static uint32_t xgene_storm_quirks(void) } static int map_one_mmio(struct domain *d, const char *what, - paddr_t start, paddr_t end) + unsigned long start, unsigned long end) { int ret; printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", start, end, what); - ret = map_mmio_regions(d, paddr_to_pfn(start), - paddr_to_pfn_aligned(end), - paddr_to_pfn(start)); + ret = map_mmio_regions(d, start, end - start + 1, start); if ( ret ) printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", what, start, d->domain_id); @@ -91,18 +89,22 @@ static int xgene_storm_specific_mapping(struct domain *d) int ret; /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEM REGION", 0xe000000000UL, 0xe010000000UL); + ret = map_one_mmio(d, "PCI MEM REGION", paddr_to_pfn(0xe000000000UL), + paddr_to_pfn(0xe010000000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI IO REGION", 0xe080000000UL, 0xe080010000UL); + ret = map_one_mmio(d, "PCI IO REGION", paddr_to_pfn(0xe080000000UL), + paddr_to_pfn(0xe080010000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI CFG REGION", 0xe0d0000000UL, 0xe0d0200000UL); + ret = map_one_mmio(d, "PCI CFG REGION", paddr_to_pfn(0xe0d0000000UL), + paddr_to_pfn(0xe0d0200000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI MSI REGION", 0xe010000000UL, 0xe010800000UL); + ret = map_one_mmio(d, "PCI MSI REGION", paddr_to_pfn(0xe010000000UL), + paddr_to_pfn(0xe010800000UL)); if ( ret ) goto err; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index eea9c55..06c93a0 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -99,11 +99,12 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gfn and end_gfn is the range in the guest - * physical address space to map, starting from the machine frame number mfn. */ +/* Map MMIO regions in the p2m: start_gfn and nr_mfns describe the range + * in the guest physical address space to map, starting from the machine + * frame number mfn. */ int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long end_gfn, + unsigned long nr_mfns, unsigned long mfn); int guest_physmap_add_entry(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 Jul 19 09:12:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8QgS-0006M1-9X; Sat, 19 Jul 2014 09:12:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgR-0006Li-03 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:59 +0000 Received: from [85.158.143.35:35031] by server-3.bemta-4.messagelabs.com id 8E/64-09960-E563AC35; Sat, 19 Jul 2014 09:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1405761116!11428429!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25329 invoked from network); 19 Jul 2014 09:11:56 -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; 19 Jul 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 1X8QgN-0004iN-Pn for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgN-0003S9-Nw for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:11:55 +0000 Date: Sat, 19 Jul 2014 09:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: let map_mmio_regions() use start and count X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88c10b0d6eeea50302fa276ec78ac0ded393a979 Author: Arianna Avanzini AuthorDate: Mon Jul 14 02:50:24 2014 +0200 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 arch/arm: let map_mmio_regions() use start and count Currently, the arguments given to the function map_mmio_regions() to describe the memory range to be mapped are the start and end page frame numbers of the range to be mapped. However, this could give rise to issues due to the range being inclusive or exclusive of the end gfn given as parameter. This commit changes the interface of the function to accept the start gfn and the number of gfns to be mapped. This commit also changes the interface of the function map_one_mmio(), helper for the xgene-storm platform, which is a wrapper for the function map_mmio_regions() and does not need its arguments to be paddr_t. NOTE: platform-specific code has not been tested, save for the sunxi and the Arndale Exynos 5 platforms (see the Tested-by below for the latter). Signed-off-by: Arianna Avanzini Acked-by: Julien Grall Acked-by: Ian Campbell Tested-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik [ ijc -- remove stray extra parameter in xgene-storm.c ] --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/gic-v2.c | 13 ++++--------- xen/arch/arm/p2m.c | 4 ++-- xen/arch/arm/platforms/exynos5.c | 6 ++---- xen/arch/arm/platforms/omap5.c | 12 ++++-------- xen/arch/arm/platforms/xgene-storm.c | 18 ++++++++++-------- xen/include/asm-arm/p2m.h | 7 ++++--- 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f150933..c58ad75 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1020,7 +1020,7 @@ static int map_device(struct domain *d, struct dt_device_node *dev) } res = map_mmio_regions(d, paddr_to_pfn(addr & PAGE_MASK), - paddr_to_pfn_aligned(addr + size), + DIV_ROUND_UP(size, PAGE_SIZE), paddr_to_pfn(addr & PAGE_MASK)); if ( res ) { diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 8db5cd8..1305542 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -440,22 +440,17 @@ static int gicv2v_setup(struct domain *d) * The second page is always mapped at +4K irrespective of the * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. */ - ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), - paddr_to_pfn_aligned(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn(gicv2.vbase)); + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), 1, + paddr_to_pfn(gicv2.vbase)); if ( ret ) return ret; if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn_aligned(d->arch.vgic.cbase + - (2 * PAGE_SIZE)), - paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); + 2, paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - paddr_to_pfn_aligned(d->arch.vgic.cbase + - (2 * PAGE_SIZE)), - paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); + 2, paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); return ret; } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 7364eaa..69029f4 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -814,12 +814,12 @@ int p2m_populate_ram(struct domain *d, int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long end_gfn, + unsigned long nr_mfns, unsigned long mfn) { return apply_p2m_changes(d, INSERT, pfn_to_paddr(start_gfn), - pfn_to_paddr(end_gfn), + pfn_to_paddr(start_gfn + nr_mfns), pfn_to_paddr(mfn), MATTR_DEV, p2m_mmio_direct); } diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 078b020..b65c2c2 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -54,13 +54,11 @@ static int exynos5_init_time(void) static int exynos5_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), - paddr_to_pfn_aligned(EXYNOS5_PA_CHIPID + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), 1, paddr_to_pfn(EXYNOS5_PA_CHIPID)); /* Map the PWM region */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), - paddr_to_pfn_aligned(EXYNOS5_PA_TIMER + (PAGE_SIZE * 2)), + map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), 2, paddr_to_pfn(EXYNOS5_PA_TIMER)); return 0; diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 16acd0c..9d6e504 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -102,23 +102,19 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), - paddr_to_pfn_aligned(OMAP5_PRM_BASE + (PAGE_SIZE * 2)), + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), 2, paddr_to_pfn(OMAP5_PRM_BASE)); /* Map the PRM_MPU */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), - paddr_to_pfn_aligned(OMAP5_PRCM_MPU_BASE + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), 1, paddr_to_pfn(OMAP5_PRCM_MPU_BASE)); /* Map the Wakeup Gen */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), - paddr_to_pfn_aligned(OMAP5_WKUPGEN_BASE + PAGE_SIZE), + map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), 1, paddr_to_pfn(OMAP5_WKUPGEN_BASE)); /* Map the on-chip SRAM */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), - paddr_to_pfn_aligned(OMAP5_SRAM_PA + (PAGE_SIZE * 32)), + map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), 32, paddr_to_pfn(OMAP5_SRAM_PA)); return 0; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index e50b916..29c4752 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -41,15 +41,13 @@ static uint32_t xgene_storm_quirks(void) } static int map_one_mmio(struct domain *d, const char *what, - paddr_t start, paddr_t end) + unsigned long start, unsigned long end) { int ret; printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", start, end, what); - ret = map_mmio_regions(d, paddr_to_pfn(start), - paddr_to_pfn_aligned(end), - paddr_to_pfn(start)); + ret = map_mmio_regions(d, start, end - start + 1, start); if ( ret ) printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", what, start, d->domain_id); @@ -91,18 +89,22 @@ static int xgene_storm_specific_mapping(struct domain *d) int ret; /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEM REGION", 0xe000000000UL, 0xe010000000UL); + ret = map_one_mmio(d, "PCI MEM REGION", paddr_to_pfn(0xe000000000UL), + paddr_to_pfn(0xe010000000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI IO REGION", 0xe080000000UL, 0xe080010000UL); + ret = map_one_mmio(d, "PCI IO REGION", paddr_to_pfn(0xe080000000UL), + paddr_to_pfn(0xe080010000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI CFG REGION", 0xe0d0000000UL, 0xe0d0200000UL); + ret = map_one_mmio(d, "PCI CFG REGION", paddr_to_pfn(0xe0d0000000UL), + paddr_to_pfn(0xe0d0200000UL)); if ( ret ) goto err; - ret = map_one_mmio(d, "PCI MSI REGION", 0xe010000000UL, 0xe010800000UL); + ret = map_one_mmio(d, "PCI MSI REGION", paddr_to_pfn(0xe010000000UL), + paddr_to_pfn(0xe010800000UL)); if ( ret ) goto err; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index eea9c55..06c93a0 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -99,11 +99,12 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gfn and end_gfn is the range in the guest - * physical address space to map, starting from the machine frame number mfn. */ +/* Map MMIO regions in the p2m: start_gfn and nr_mfns describe the range + * in the guest physical address space to map, starting from the machine + * frame number mfn. */ int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long end_gfn, + unsigned long nr_mfns, unsigned long mfn); int guest_physmap_add_entry(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 Jul 19 09:12:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8Qgc-0006Ni-Cd; Sat, 19 Jul 2014 09:12:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qga-0006NS-SU for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:09 +0000 Received: from [85.158.139.211:46710] by server-10.bemta-5.messagelabs.com id 15/29-25335-8663AC35; Sat, 19 Jul 2014 09:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1405761126!16391947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16141 invoked from network); 19 Jul 2014 09:12:07 -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 Jul 2014 09:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgY-0004iw-3n for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgX-0003Sg-Sm for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:05 +0000 Date: Sat, 19 Jul 2014 09:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Shuffle definitions and uses of min()/max() 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 78bf682c36fa4c4969e020a1a38306ce836d18ad Author: Andrew Cooper AuthorDate: Wed Jul 16 15:32:05 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 tools/libxc: Shuffle definitions and uses of min()/max() macros Move the typesafe min() macro from xc_dom_decompress_unsafe_xz.c to xc_private.h, and complement it with an equivalent max() macro. Replace current users of type unsafe MIN()/MAX() macros, and remove their scattered definitions. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_core_x86.c | 4 ---- tools/libxc/xc_dom_decompress_unsafe_xz.c | 6 ------ tools/libxc/xc_domain_restore.c | 2 +- tools/libxc/xc_private.h | 11 +++++++++++ tools/libxc/xg_private.h | 2 +- tools/libxc/xg_save_restore.h | 7 ------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index e328dcf..f05060a 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -24,10 +24,6 @@ #define GET_FIELD(_p, _f) ((dinfo->guest_width==8) ? ((_p)->x64._f) : ((_p)->x32._f)) -#ifndef MAX -#define MAX(_a, _b) ((_a) >= (_b) ? (_a) : (_b)) -#endif - int xc_core_arch_gpfn_may_present(struct xc_core_arch_context *arch_ctxt, unsigned long pfn) diff --git a/tools/libxc/xc_dom_decompress_unsafe_xz.c b/tools/libxc/xc_dom_decompress_unsafe_xz.c index 6be1f89..fe7a7f4 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_xz.c +++ b/tools/libxc/xc_dom_decompress_unsafe_xz.c @@ -34,12 +34,6 @@ static inline u32 le32_to_cpup(const u32 *p) return cpu_to_le32(*p); } -#define min(x,y) ({ \ - const typeof(x) _x = (x); \ - const typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x < _y ? _x : _y; }) - #define __force #define always_inline diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 071ab6a..e73e0a2 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -339,7 +339,7 @@ static xen_pfn_t *load_p2m_frame_list( /* Any remaining bytes of this chunk: read and discard. */ while ( chunk_bytes ) { - unsigned long sz = MIN(chunk_bytes, sizeof(xen_pfn_t)); + unsigned long sz = min_t(unsigned long, chunk_bytes, sizeof(xen_pfn_t)); if ( RDEXACT(io_fd, &p2m_fl_zero, sz) ) { PERROR("read-and-discard extended-info chunk bytes failed"); diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c240a7c..ce7e81e 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -349,6 +349,17 @@ int xc_ffs16(uint16_t x); int xc_ffs32(uint32_t x); int xc_ffs64(uint64_t x); +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#define max(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x > _y) ? _x : _y; }) + #define min_t(type,x,y) \ ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #define max_t(type,x,y) \ diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index e593364..1910361 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -159,7 +159,7 @@ static inline xen_pfn_t xc_pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, /* Size in bytes of the pfn_to_mfn_frame_list */ #define P2M_GUEST_FL_SIZE ((P2M_FL_ENTRIES) * (dinfo->guest_width)) #define P2M_TOOLS_FL_SIZE ((P2M_FL_ENTRIES) * \ - MAX((sizeof (xen_pfn_t)), dinfo->guest_width)) + max_t(size_t, sizeof(xen_pfn_t), dinfo->guest_width)) /* Masks for PTE<->PFN conversions */ #define MADDR_BITS_X86 ((dinfo->guest_width == 8) ? 52 : 44) diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index aa93c13..bdd9009 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -392,10 +392,3 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, else \ memset(&(_p)->x32._f[0], (_v), sizeof((_p)->x32._f)); \ } while (0) - -#ifndef MAX -#define MAX(_a, _b) ((_a) >= (_b) ? (_a) : (_b)) -#endif -#ifndef MIN -#define MIN(_a, _b) ((_a) <= (_b) ? (_a) : (_b)) -#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 Jul 19 09:12:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8Qgc-0006Ni-Cd; Sat, 19 Jul 2014 09:12:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qga-0006NS-SU for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:09 +0000 Received: from [85.158.139.211:46710] by server-10.bemta-5.messagelabs.com id 15/29-25335-8663AC35; Sat, 19 Jul 2014 09:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1405761126!16391947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16141 invoked from network); 19 Jul 2014 09:12:07 -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 Jul 2014 09:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QgY-0004iw-3n for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QgX-0003Sg-Sm for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:05 +0000 Date: Sat, 19 Jul 2014 09:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Shuffle definitions and uses of min()/max() 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 78bf682c36fa4c4969e020a1a38306ce836d18ad Author: Andrew Cooper AuthorDate: Wed Jul 16 15:32:05 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 tools/libxc: Shuffle definitions and uses of min()/max() macros Move the typesafe min() macro from xc_dom_decompress_unsafe_xz.c to xc_private.h, and complement it with an equivalent max() macro. Replace current users of type unsafe MIN()/MAX() macros, and remove their scattered definitions. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_core_x86.c | 4 ---- tools/libxc/xc_dom_decompress_unsafe_xz.c | 6 ------ tools/libxc/xc_domain_restore.c | 2 +- tools/libxc/xc_private.h | 11 +++++++++++ tools/libxc/xg_private.h | 2 +- tools/libxc/xg_save_restore.h | 7 ------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index e328dcf..f05060a 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -24,10 +24,6 @@ #define GET_FIELD(_p, _f) ((dinfo->guest_width==8) ? ((_p)->x64._f) : ((_p)->x32._f)) -#ifndef MAX -#define MAX(_a, _b) ((_a) >= (_b) ? (_a) : (_b)) -#endif - int xc_core_arch_gpfn_may_present(struct xc_core_arch_context *arch_ctxt, unsigned long pfn) diff --git a/tools/libxc/xc_dom_decompress_unsafe_xz.c b/tools/libxc/xc_dom_decompress_unsafe_xz.c index 6be1f89..fe7a7f4 100644 --- a/tools/libxc/xc_dom_decompress_unsafe_xz.c +++ b/tools/libxc/xc_dom_decompress_unsafe_xz.c @@ -34,12 +34,6 @@ static inline u32 le32_to_cpup(const u32 *p) return cpu_to_le32(*p); } -#define min(x,y) ({ \ - const typeof(x) _x = (x); \ - const typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x < _y ? _x : _y; }) - #define __force #define always_inline diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 071ab6a..e73e0a2 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -339,7 +339,7 @@ static xen_pfn_t *load_p2m_frame_list( /* Any remaining bytes of this chunk: read and discard. */ while ( chunk_bytes ) { - unsigned long sz = MIN(chunk_bytes, sizeof(xen_pfn_t)); + unsigned long sz = min_t(unsigned long, chunk_bytes, sizeof(xen_pfn_t)); if ( RDEXACT(io_fd, &p2m_fl_zero, sz) ) { PERROR("read-and-discard extended-info chunk bytes failed"); diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c240a7c..ce7e81e 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -349,6 +349,17 @@ int xc_ffs16(uint16_t x); int xc_ffs32(uint32_t x); int xc_ffs64(uint64_t x); +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#define max(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x > _y) ? _x : _y; }) + #define min_t(type,x,y) \ ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #define max_t(type,x,y) \ diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index e593364..1910361 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -159,7 +159,7 @@ static inline xen_pfn_t xc_pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, /* Size in bytes of the pfn_to_mfn_frame_list */ #define P2M_GUEST_FL_SIZE ((P2M_FL_ENTRIES) * (dinfo->guest_width)) #define P2M_TOOLS_FL_SIZE ((P2M_FL_ENTRIES) * \ - MAX((sizeof (xen_pfn_t)), dinfo->guest_width)) + max_t(size_t, sizeof(xen_pfn_t), dinfo->guest_width)) /* Masks for PTE<->PFN conversions */ #define MADDR_BITS_X86 ((dinfo->guest_width == 8) ? 52 : 44) diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index aa93c13..bdd9009 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -392,10 +392,3 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, else \ memset(&(_p)->x32._f[0], (_v), sizeof((_p)->x32._f)); \ } while (0) - -#ifndef MAX -#define MAX(_a, _b) ((_a) >= (_b) ? (_a) : (_b)) -#endif -#ifndef MIN -#define MIN(_a, _b) ((_a) <= (_b) ? (_a) : (_b)) -#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 Jul 19 09:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qgm-0006PG-FE; Sat, 19 Jul 2014 09:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgl-0006P3-9M for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:19 +0000 Received: from [85.158.137.68:39578] by server-2.bemta-3.messagelabs.com id 0B/A1-09149-2763AC35; Sat, 19 Jul 2014 09:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1405761136!16814799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13923 invoked from network); 19 Jul 2014 09:12:17 -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; 19 Jul 2014 09:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgi-0004j2-Ee for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qgi-0003TF-DO for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:16 +0000 Date: Sat, 19 Jul 2014 09:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: x86_64: make thread stacks 16-byte aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 750cdc32d73f8d5e4e1cbd1f252dd145e8e8c962 Author: Thomas Leonard AuthorDate: Wed Jul 16 12:07:41 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 mini-os: x86_64: make thread stacks 16-byte aligned Otherwise, passing doubles to varargs functions causes a crash. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/sched.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/x86/sched.c b/extras/mini-os/arch/x86/sched.c index 8a05b58..e4a3dc2 100644 --- a/extras/mini-os/arch/x86/sched.c +++ b/extras/mini-os/arch/x86/sched.c @@ -107,6 +107,9 @@ struct thread* arch_create_thread(char *name, void (*function)(void *), thread->sp = (unsigned long)thread->stack + STACK_SIZE; /* Save pointer to the thread on the stack, used by current macro */ *((unsigned long *)thread->stack) = (unsigned long)thread; + + /* Must ensure that (%rsp + 8) is 16-byte aligned at the start of thread_starter. */ + thread->sp -= sizeof(unsigned long); stack_push(thread, (unsigned long) function); stack_push(thread, (unsigned long) 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 Sat Jul 19 09:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qgm-0006PG-FE; Sat, 19 Jul 2014 09:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgl-0006P3-9M for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:19 +0000 Received: from [85.158.137.68:39578] by server-2.bemta-3.messagelabs.com id 0B/A1-09149-2763AC35; Sat, 19 Jul 2014 09:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1405761136!16814799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13923 invoked from network); 19 Jul 2014 09:12:17 -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; 19 Jul 2014 09:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgi-0004j2-Ee for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qgi-0003TF-DO for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:16 +0000 Date: Sat, 19 Jul 2014 09:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: x86_64: make thread stacks 16-byte aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 750cdc32d73f8d5e4e1cbd1f252dd145e8e8c962 Author: Thomas Leonard AuthorDate: Wed Jul 16 12:07:41 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 mini-os: x86_64: make thread stacks 16-byte aligned Otherwise, passing doubles to varargs functions causes a crash. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/sched.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/x86/sched.c b/extras/mini-os/arch/x86/sched.c index 8a05b58..e4a3dc2 100644 --- a/extras/mini-os/arch/x86/sched.c +++ b/extras/mini-os/arch/x86/sched.c @@ -107,6 +107,9 @@ struct thread* arch_create_thread(char *name, void (*function)(void *), thread->sp = (unsigned long)thread->stack + STACK_SIZE; /* Save pointer to the thread on the stack, used by current macro */ *((unsigned long *)thread->stack) = (unsigned long)thread; + + /* Must ensure that (%rsp + 8) is 16-byte aligned at the start of thread_starter. */ + thread->sp -= sizeof(unsigned long); stack_push(thread, (unsigned long) function); stack_push(thread, (unsigned long) 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 Sat Jul 19 09:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09: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 1X8Qgw-0006Ql-Hq; Sat, 19 Jul 2014 09:12:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgv-0006QV-GI for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:29 +0000 Received: from [85.158.137.68:26177] by server-7.bemta-3.messagelabs.com id 11/5E-01084-C763AC35; Sat, 19 Jul 2014 09:12:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1405761146!12878531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28739 invoked from network); 19 Jul 2014 09:12:27 -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; 19 Jul 2014 09:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgs-0004j8-L7 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qgs-0003Tb-HN for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:26 +0000 Date: Sat, 19 Jul 2014 09:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use generic local_irq_enable 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 67980734bdbc0cc307cd5620ed0804f70c0b3434 Author: Thomas Leonard AuthorDate: Wed Jul 16 12:07:46 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 mini-os: use generic local_irq_enable function __sti is x86 specific. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/kernel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 9a30550..437e5b4 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -121,7 +121,7 @@ void start_kernel(void) init_events(); /* ENABLE EVENT DELIVERY. This is disabled at start of day. */ - __sti(); + local_irq_enable(); setup_xen_features(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09: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 1X8Qgw-0006Ql-Hq; Sat, 19 Jul 2014 09:12:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgv-0006QV-GI for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:29 +0000 Received: from [85.158.137.68:26177] by server-7.bemta-3.messagelabs.com id 11/5E-01084-C763AC35; Sat, 19 Jul 2014 09:12:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1405761146!12878531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28739 invoked from network); 19 Jul 2014 09:12:27 -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; 19 Jul 2014 09:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qgs-0004j8-L7 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qgs-0003Tb-HN for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:26 +0000 Date: Sat, 19 Jul 2014 09:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: use generic local_irq_enable 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 67980734bdbc0cc307cd5620ed0804f70c0b3434 Author: Thomas Leonard AuthorDate: Wed Jul 16 12:07:46 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:08 2014 +0100 mini-os: use generic local_irq_enable function __sti is x86 specific. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/kernel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 9a30550..437e5b4 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -121,7 +121,7 @@ void start_kernel(void) init_events(); /* ENABLE EVENT DELIVERY. This is disabled at start of day. */ - __sti(); + local_irq_enable(); setup_xen_features(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:12:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8Qh6-0006SB-KY; Sat, 19 Jul 2014 09:12:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qh5-0006Rw-Fe for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:39 +0000 Received: from [193.109.254.147:53540] by server-2.bemta-14.messagelabs.com id 8F/6A-09196-6863AC35; Sat, 19 Jul 2014 09:12:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1405761156!18369898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4691 invoked from network); 19 Jul 2014 09:12:37 -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; 19 Jul 2014 09:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qh2-0004jG-PT for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qh2-0003Um-Nm for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:36 +0000 Date: Sat, 19 Jul 2014 09:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add Juno earlyprintk configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2043c066a235948debae450640b60aa9288a7e07 Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:11 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: Add Juno earlyprintk configuration Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 9319694..8658176 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -94,6 +94,11 @@ EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), juno) +EARLY_PRINTK_INC := pl011 +EARLY_PRINTK_BAUD := 115200 +EARLY_UART_BASE_ADDRESS := 0x7ff80000 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:12:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8Qh6-0006SB-KY; Sat, 19 Jul 2014 09:12:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qh5-0006Rw-Fe for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:39 +0000 Received: from [193.109.254.147:53540] by server-2.bemta-14.messagelabs.com id 8F/6A-09196-6863AC35; Sat, 19 Jul 2014 09:12:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1405761156!18369898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4691 invoked from network); 19 Jul 2014 09:12:37 -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; 19 Jul 2014 09:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qh2-0004jG-PT for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qh2-0003Um-Nm for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:36 +0000 Date: Sat, 19 Jul 2014 09:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add Juno earlyprintk configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2043c066a235948debae450640b60aa9288a7e07 Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:11 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: Add Juno earlyprintk configuration Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 9319694..8658176 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -94,6 +94,11 @@ EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), juno) +EARLY_PRINTK_INC := pl011 +EARLY_PRINTK_BAUD := 115200 +EARLY_UART_BASE_ADDRESS := 0x7ff80000 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:12:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8QhH-0006Ts-NL; Sat, 19 Jul 2014 09:12:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhF-0006TT-In for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:49 +0000 Received: from [85.158.143.35:37613] by server-1.bemta-4.messagelabs.com id 5D/16-30046-0963AC35; Sat, 19 Jul 2014 09:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1405761167!18720553!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11357 invoked from network); 19 Jul 2014 09:12:48 -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; 19 Jul 2014 09:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhC-0004jM-UN for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhC-0003VE-SA for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:46 +0000 Date: Sat, 19 Jul 2014 09:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use physical processor ID (MPIDR) when calling psci CPU_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 d99504872178523b024bfb36736b158a42c5060e Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:47 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: use physical processor ID (MPIDR) when calling psci CPU_ON Xen's logical CPU map can differ from the underlying layout. Also add an emacs magic block to this file. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/psci.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 25a8697..b6360d5 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -54,7 +54,8 @@ static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, cpu, __pa(init_secondary), 0); + return __invoke_psci_fn_smc(psci_cpu_on_nr, + cpu_logical_map(cpu), __pa(init_secondary), 0); } int __init psci_init(void) @@ -96,3 +97,12 @@ int __init psci_init(void) return 0; } + +/* + * 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 Jul 19 09:12:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:12: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 1X8QhH-0006Ts-NL; Sat, 19 Jul 2014 09:12:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhF-0006TT-In for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:49 +0000 Received: from [85.158.143.35:37613] by server-1.bemta-4.messagelabs.com id 5D/16-30046-0963AC35; Sat, 19 Jul 2014 09:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1405761167!18720553!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11357 invoked from network); 19 Jul 2014 09:12:48 -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; 19 Jul 2014 09:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhC-0004jM-UN for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhC-0003VE-SA for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:46 +0000 Date: Sat, 19 Jul 2014 09:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use physical processor ID (MPIDR) when calling psci CPU_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 d99504872178523b024bfb36736b158a42c5060e Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:47 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: use physical processor ID (MPIDR) when calling psci CPU_ON Xen's logical CPU map can differ from the underlying layout. Also add an emacs magic block to this file. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/psci.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 25a8697..b6360d5 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -54,7 +54,8 @@ static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, cpu, __pa(init_secondary), 0); + return __invoke_psci_fn_smc(psci_cpu_on_nr, + cpu_logical_map(cpu), __pa(init_secondary), 0); } int __init psci_init(void) @@ -96,3 +97,12 @@ int __init psci_init(void) return 0; } + +/* + * 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 Jul 19 09:13:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:13: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 1X8QhT-0006Vf-06; Sat, 19 Jul 2014 09:13:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhP-0006VE-LZ for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:59 +0000 Received: from [193.109.254.147:37978] by server-9.bemta-14.messagelabs.com id 97/21-31535-A963AC35; Sat, 19 Jul 2014 09:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1405761177!13725736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24085 invoked from network); 19 Jul 2014 09:12:58 -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; 19 Jul 2014 09:12:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhN-0004jV-3i for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhN-0003Va-0r for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:57 +0000 Date: Sat, 19 Jul 2014 09:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: when ALLOCATING p2m entries maddr is meaningless X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2bc4eccf0ef0e294f6da86c6a6066e9329419d5 Author: Ian Campbell AuthorDate: Mon Jul 14 17:27:04 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: when ALLOCATING p2m entries maddr is meaningless The maddr differs on each loop depending on the pages which happen to get allocated. There is already an assertion that maddr == 0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 69029f4..c3d63f0 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -501,7 +501,6 @@ static int apply_one_level(struct domain *d, p2m->stats.mappings[level]++; *addr += level_size; - *maddr += level_size; return P2M_ONE_PROGRESS; } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:13:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:13: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 1X8QhT-0006Vf-06; Sat, 19 Jul 2014 09:13:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhP-0006VE-LZ for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:59 +0000 Received: from [193.109.254.147:37978] by server-9.bemta-14.messagelabs.com id 97/21-31535-A963AC35; Sat, 19 Jul 2014 09:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1405761177!13725736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24085 invoked from network); 19 Jul 2014 09:12:58 -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; 19 Jul 2014 09:12:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhN-0004jV-3i for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhN-0003Va-0r for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:12:57 +0000 Date: Sat, 19 Jul 2014 09:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: when ALLOCATING p2m entries maddr is meaningless X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2bc4eccf0ef0e294f6da86c6a6066e9329419d5 Author: Ian Campbell AuthorDate: Mon Jul 14 17:27:04 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: when ALLOCATING p2m entries maddr is meaningless The maddr differs on each loop depending on the pages which happen to get allocated. There is already an assertion that maddr == 0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 69029f4..c3d63f0 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -501,7 +501,6 @@ static int apply_one_level(struct domain *d, p2m->stats.mappings[level]++; *addr += level_size; - *maddr += level_size; return P2M_ONE_PROGRESS; } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:13:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:13: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 1X8Qhb-0006Wv-4S; Sat, 19 Jul 2014 09:13:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qha-0006Wg-0z for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:10 +0000 Received: from [85.158.137.68:45722] by server-8.bemta-3.messagelabs.com id FA/42-31195-5A63AC35; Sat, 19 Jul 2014 09:13:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405761187!16840608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27016 invoked from network); 19 Jul 2014 09:13: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; 19 Jul 2014 09:13:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhX-0004k4-89 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhX-0003W7-6I for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:07 +0000 Date: Sat, 19 Jul 2014 09:13:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correctly handle removing a subset of a superpage mapping. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 675498f8ca744f21a6f48d4d2d0ac4bc8db3bb89 Author: Ian Campbell AuthorDate: Mon Jul 14 17:27:05 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: correctly handle removing a subset of a superpage mapping. This can be exercised for example via ballooning which will remove 4K regions from anywhere in the address space. Reported-by: Julien Grall Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c3d63f0..2f855b5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -604,8 +604,33 @@ static int apply_one_level(struct domain *d, return P2M_ONE_PROGRESS_NOP; } - if ( level < 3 && p2m_table(orig_pte) ) - return P2M_ONE_DESCEND; + if ( level < 3 ) + { + if ( p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + if ( op == REMOVE && + !is_mapping_aligned(*addr, end_gpaddr, + 0, /* maddr doesn't matter for remove */ + level_size) ) + { + /* + * Removing a mapping from the middle of a superpage. Shatter + * and descend. + */ + *flush = true; + rc = p2m_create_table(d, entry, + level_shift - PAGE_SHIFT, flush_cache); + if ( rc < 0 ) + return rc; + + p2m->stats.shattered[level]++; + p2m->stats.mappings[level]--; + p2m->stats.mappings[level+1] += LPAE_ENTRIES; + + return P2M_ONE_DESCEND; + } + } *flush = true; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:13:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 2014 09:13: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 1X8Qhb-0006Wv-4S; Sat, 19 Jul 2014 09:13:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qha-0006Wg-0z for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:10 +0000 Received: from [85.158.137.68:45722] by server-8.bemta-3.messagelabs.com id FA/42-31195-5A63AC35; Sat, 19 Jul 2014 09:13:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405761187!16840608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27016 invoked from network); 19 Jul 2014 09:13: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; 19 Jul 2014 09:13:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8QhX-0004k4-89 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8QhX-0003W7-6I for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:07 +0000 Date: Sat, 19 Jul 2014 09:13:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correctly handle removing a subset of a superpage mapping. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 675498f8ca744f21a6f48d4d2d0ac4bc8db3bb89 Author: Ian Campbell AuthorDate: Mon Jul 14 17:27:05 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: correctly handle removing a subset of a superpage mapping. This can be exercised for example via ballooning which will remove 4K regions from anywhere in the address space. Reported-by: Julien Grall Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c3d63f0..2f855b5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -604,8 +604,33 @@ static int apply_one_level(struct domain *d, return P2M_ONE_PROGRESS_NOP; } - if ( level < 3 && p2m_table(orig_pte) ) - return P2M_ONE_DESCEND; + if ( level < 3 ) + { + if ( p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + if ( op == REMOVE && + !is_mapping_aligned(*addr, end_gpaddr, + 0, /* maddr doesn't matter for remove */ + level_size) ) + { + /* + * Removing a mapping from the middle of a superpage. Shatter + * and descend. + */ + *flush = true; + rc = p2m_create_table(d, entry, + level_shift - PAGE_SHIFT, flush_cache); + if ( rc < 0 ) + return rc; + + p2m->stats.shattered[level]++; + p2m->stats.mappings[level]--; + p2m->stats.mappings[level+1] += LPAE_ENTRIES; + + return P2M_ONE_DESCEND; + } + } *flush = true; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:13:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qhl-0006YZ-76; Sat, 19 Jul 2014 09:13:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qhk-0006YM-14 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:20 +0000 Received: from [85.158.143.35:41271] by server-3.bemta-4.messagelabs.com id C0/C4-09960-FA63AC35; Sat, 19 Jul 2014 09:13:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405761197!18743830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 735 invoked from network); 19 Jul 2014 09:13:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2014 09:13:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qhh-0004kA-Cj for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qhh-0003WW-Bk for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:17 +0000 Date: Sat, 19 Jul 2014 09:13:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1870804e58565399cd770e93f62e7ce57cd5231 Author: Ian Campbell AuthorDate: Mon Jul 14 17:39:10 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables Otherwise a stale TLB entry can shadow the fixmap/UART or DTB mapping Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 13 ++++++++++++- xen/arch/arm/arm64/head.S | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 8a6594a..73b97cb 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -360,9 +360,20 @@ paging: ldr r4, =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: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb /* Ensure any page table updates made above + * have occurred. */ + + isb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 2a13527..7d53143 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -382,9 +382,20 @@ paging: ldr x1, =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: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb sy /* Ensure any page table updates made above + * have occurred. */ + + isb + tlbi alle2 + dsb sy /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 19 09:13:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Jul 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 1X8Qhl-0006YZ-76; Sat, 19 Jul 2014 09:13:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qhk-0006YM-14 for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:20 +0000 Received: from [85.158.143.35:41271] by server-3.bemta-4.messagelabs.com id C0/C4-09960-FA63AC35; Sat, 19 Jul 2014 09:13:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1405761197!18743830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 735 invoked from network); 19 Jul 2014 09:13:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2014 09:13:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8Qhh-0004kA-Cj for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8Qhh-0003WW-Bk for xen-changelog@lists.xensource.com; Sat, 19 Jul 2014 09:13:17 +0000 Date: Sat, 19 Jul 2014 09:13:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1870804e58565399cd770e93f62e7ce57cd5231 Author: Ian Campbell AuthorDate: Mon Jul 14 17:39:10 2014 +0100 Commit: Ian Campbell CommitDate: Fri Jul 18 13:38:09 2014 +0100 xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables Otherwise a stale TLB entry can shadow the fixmap/UART or DTB mapping Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 13 ++++++++++++- xen/arch/arm/arm64/head.S | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 8a6594a..73b97cb 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -360,9 +360,20 @@ paging: ldr r4, =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: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb /* Ensure any page table updates made above + * have occurred. */ + + isb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 2a13527..7d53143 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -382,9 +382,20 @@ paging: ldr x1, =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: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb sy /* Ensure any page table updates made above + * have occurred. */ + + isb + tlbi alle2 + dsb sy /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 20 09:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Jul 2014 09:22: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 1X8nJn-00084z-MM; Sun, 20 Jul 2014 09:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJm-00084u-Ib for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:06 +0000 Received: from [85.158.143.35:49749] by server-2.bemta-4.messagelabs.com id 20/9A-26128-D3A8BC35; Sun, 20 Jul 2014 09:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1405848124!18817095!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21304 invoked from network); 20 Jul 2014 09:22:05 -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; 20 Jul 2014 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJj-0002pK-Uh for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8nJj-0003ab-I9 for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:03 +0000 Date: Sun, 20 Jul 2014 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] audio: fmopl: drop INLINE 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 d74195688298b0550f4515a4e502232ae8312a88 Author: Luiz Capitulino AuthorDate: Thu Jun 19 10:19:32 2014 -0400 Commit: Stefano Stabellini CommitDate: Fri Jul 18 17:19:24 2014 +0000 audio: fmopl: drop INLINE macro This commit expands all uses of the INLINE macro and drop it. The reason for this is to avoid clashes with external libraries with bad name conventions and also because renaming keywords is not a good practice. Signed-off-by: Luiz Capitulino --- hw/audio/fmopl.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 290a224..adcef2d 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -30,7 +30,6 @@ * License along with this library; if not, see . */ -#define INLINE static inline #define HAS_YM3812 1 #include @@ -247,7 +246,7 @@ static INT32 feedback2; /* connect for SLOT 2 */ /* --------------------- subroutines --------------------- */ -INLINE int Limit( int val, int max, int min ) { +static inline int Limit( int val, int max, int min ) { if ( val > max ) val = max; else if ( val < min ) @@ -257,7 +256,7 @@ INLINE int Limit( int val, int max, int min ) { } /* status set and IRQ handling */ -INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) +static inline void OPL_STATUS_SET(FM_OPL *OPL,int flag) { /* set status flag */ OPL->status |= flag; @@ -273,7 +272,7 @@ INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) } /* status reset and IRQ handling */ -INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) +static inline void OPL_STATUS_RESET(FM_OPL *OPL,int flag) { /* reset status flag */ OPL->status &=~flag; @@ -289,7 +288,7 @@ INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) } /* IRQ mask set */ -INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) +static inline void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) { OPL->statusmask = flag; /* IRQ handling check */ @@ -298,7 +297,7 @@ INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) } /* ----- key on ----- */ -INLINE void OPL_KEYON(OPL_SLOT *SLOT) +static inline void OPL_KEYON(OPL_SLOT *SLOT) { /* sin wave restart */ SLOT->Cnt = 0; @@ -309,7 +308,7 @@ INLINE void OPL_KEYON(OPL_SLOT *SLOT) SLOT->eve = EG_AED; } /* ----- key off ----- */ -INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) +static inline void OPL_KEYOFF(OPL_SLOT *SLOT) { if( SLOT->evm > ENV_MOD_RR) { @@ -325,7 +324,7 @@ INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) /* ---------- calcrate Envelope Generator & Phase Generator ---------- */ /* return : envelope output */ -INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) +static inline UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) { /* calcrate envelope generator */ if( (SLOT->evc+=SLOT->evs) >= SLOT->eve ) @@ -371,7 +370,7 @@ static void set_algorithm( OPL_CH *CH) } /* ---------- frequency counter for operater update ---------- */ -INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) +static inline void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) { int ksr; @@ -391,7 +390,7 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) } /* set multi,am,vib,EG-TYP,KSR,mul */ -INLINE void set_mul(FM_OPL *OPL,int slot,int v) +static inline void set_mul(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -405,7 +404,7 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v) } /* set ksl & tl */ -INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) +static inline void set_ksl_tl(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -421,7 +420,7 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) } /* set attack rate & decay rate */ -INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) +static inline void set_ar_dr(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -438,7 +437,7 @@ INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) } /* set sustain level & release rate */ -INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) +static inline void set_sl_rr(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -455,7 +454,7 @@ INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) /* operator output calcrator */ #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env] /* ---------- calcrate one of channel ---------- */ -INLINE void OPL_CALC_CH( OPL_CH *CH ) +static inline void OPL_CALC_CH( OPL_CH *CH ) { UINT32 env_out; OPL_SLOT *SLOT; @@ -500,7 +499,7 @@ INLINE void OPL_CALC_CH( OPL_CH *CH ) /* ---------- calcrate rhythm block ---------- */ #define WHITE_NOISE_db 6.0 -INLINE void OPL_CALC_RH( OPL_CH *CH ) +static inline void OPL_CALC_RH( OPL_CH *CH ) { UINT32 env_tam,env_sd,env_top,env_hh; int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP); @@ -716,7 +715,7 @@ static void OPLCloseTable( void ) } /* CSM Key Control */ -INLINE void CSMKeyControll(OPL_CH *CH) +static inline void CSMKeyControll(OPL_CH *CH) { OPL_SLOT *slot1 = &CH->SLOT[SLOT1]; OPL_SLOT *slot2 = &CH->SLOT[SLOT2]; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 20 09:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Jul 2014 09:22: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 1X8nJn-00084z-MM; Sun, 20 Jul 2014 09:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJm-00084u-Ib for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:06 +0000 Received: from [85.158.143.35:49749] by server-2.bemta-4.messagelabs.com id 20/9A-26128-D3A8BC35; Sun, 20 Jul 2014 09:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1405848124!18817095!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21304 invoked from network); 20 Jul 2014 09:22:05 -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; 20 Jul 2014 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJj-0002pK-Uh for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8nJj-0003ab-I9 for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:03 +0000 Date: Sun, 20 Jul 2014 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] audio: fmopl: drop INLINE 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 d74195688298b0550f4515a4e502232ae8312a88 Author: Luiz Capitulino AuthorDate: Thu Jun 19 10:19:32 2014 -0400 Commit: Stefano Stabellini CommitDate: Fri Jul 18 17:19:24 2014 +0000 audio: fmopl: drop INLINE macro This commit expands all uses of the INLINE macro and drop it. The reason for this is to avoid clashes with external libraries with bad name conventions and also because renaming keywords is not a good practice. Signed-off-by: Luiz Capitulino --- hw/audio/fmopl.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 290a224..adcef2d 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -30,7 +30,6 @@ * License along with this library; if not, see . */ -#define INLINE static inline #define HAS_YM3812 1 #include @@ -247,7 +246,7 @@ static INT32 feedback2; /* connect for SLOT 2 */ /* --------------------- subroutines --------------------- */ -INLINE int Limit( int val, int max, int min ) { +static inline int Limit( int val, int max, int min ) { if ( val > max ) val = max; else if ( val < min ) @@ -257,7 +256,7 @@ INLINE int Limit( int val, int max, int min ) { } /* status set and IRQ handling */ -INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) +static inline void OPL_STATUS_SET(FM_OPL *OPL,int flag) { /* set status flag */ OPL->status |= flag; @@ -273,7 +272,7 @@ INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) } /* status reset and IRQ handling */ -INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) +static inline void OPL_STATUS_RESET(FM_OPL *OPL,int flag) { /* reset status flag */ OPL->status &=~flag; @@ -289,7 +288,7 @@ INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) } /* IRQ mask set */ -INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) +static inline void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) { OPL->statusmask = flag; /* IRQ handling check */ @@ -298,7 +297,7 @@ INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) } /* ----- key on ----- */ -INLINE void OPL_KEYON(OPL_SLOT *SLOT) +static inline void OPL_KEYON(OPL_SLOT *SLOT) { /* sin wave restart */ SLOT->Cnt = 0; @@ -309,7 +308,7 @@ INLINE void OPL_KEYON(OPL_SLOT *SLOT) SLOT->eve = EG_AED; } /* ----- key off ----- */ -INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) +static inline void OPL_KEYOFF(OPL_SLOT *SLOT) { if( SLOT->evm > ENV_MOD_RR) { @@ -325,7 +324,7 @@ INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) /* ---------- calcrate Envelope Generator & Phase Generator ---------- */ /* return : envelope output */ -INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) +static inline UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) { /* calcrate envelope generator */ if( (SLOT->evc+=SLOT->evs) >= SLOT->eve ) @@ -371,7 +370,7 @@ static void set_algorithm( OPL_CH *CH) } /* ---------- frequency counter for operater update ---------- */ -INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) +static inline void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) { int ksr; @@ -391,7 +390,7 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) } /* set multi,am,vib,EG-TYP,KSR,mul */ -INLINE void set_mul(FM_OPL *OPL,int slot,int v) +static inline void set_mul(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -405,7 +404,7 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v) } /* set ksl & tl */ -INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) +static inline void set_ksl_tl(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -421,7 +420,7 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) } /* set attack rate & decay rate */ -INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) +static inline void set_ar_dr(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -438,7 +437,7 @@ INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) } /* set sustain level & release rate */ -INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) +static inline void set_sl_rr(FM_OPL *OPL,int slot,int v) { OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -455,7 +454,7 @@ INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) /* operator output calcrator */ #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env] /* ---------- calcrate one of channel ---------- */ -INLINE void OPL_CALC_CH( OPL_CH *CH ) +static inline void OPL_CALC_CH( OPL_CH *CH ) { UINT32 env_out; OPL_SLOT *SLOT; @@ -500,7 +499,7 @@ INLINE void OPL_CALC_CH( OPL_CH *CH ) /* ---------- calcrate rhythm block ---------- */ #define WHITE_NOISE_db 6.0 -INLINE void OPL_CALC_RH( OPL_CH *CH ) +static inline void OPL_CALC_RH( OPL_CH *CH ) { UINT32 env_tam,env_sd,env_top,env_hh; int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP); @@ -716,7 +715,7 @@ static void OPLCloseTable( void ) } /* CSM Key Control */ -INLINE void CSMKeyControll(OPL_CH *CH) +static inline void CSMKeyControll(OPL_CH *CH) { OPL_SLOT *slot1 = &CH->SLOT[SLOT1]; OPL_SLOT *slot2 = &CH->SLOT[SLOT2]; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 20 09:22:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Jul 2014 09:22: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 1X8nJz-00085u-P5; Sun, 20 Jul 2014 09:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJy-00085h-5o for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:18 +0000 Received: from [85.158.139.211:44571] by server-1.bemta-5.messagelabs.com id A8/C5-15869-94A8BC35; Sun, 20 Jul 2014 09:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405848134!12345025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8810 invoked from network); 20 Jul 2014 09:22:15 -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 Jul 2014 09:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJu-0002pO-Gr for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8nJu-0003bC-2S for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:14 +0000 Date: Sun, 20 Jul 2014 09:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fpu: softfloat: drop INLINE 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 779640a3f4f58633e8575a534838ec79b4982107 Author: Luiz Capitulino AuthorDate: Thu Jun 19 10:13:43 2014 -0400 Commit: Stefano Stabellini CommitDate: Fri Jul 18 17:19:30 2014 +0000 fpu: softfloat: drop INLINE macro This commit expands all uses of the INLINE macro and drop it. The reason for this is to avoid clashes with external libraries with bad name conventions and also because renaming keywords is not a good practice. PS: I'm fine with this change to be licensed under softfloat-2a or softfloat-2b. Signed-off-by: Luiz Capitulino --- fpu/softfloat-macros.h | 38 +++++++++--------- fpu/softfloat.c | 48 +++++++++++----------- include/fpu/softfloat.h | 99 +++++++++++++++++++++++------------------------ 3 files changed, 92 insertions(+), 93 deletions(-) diff --git a/fpu/softfloat-macros.h b/fpu/softfloat-macros.h index 9b09545..0dcda93 100644 --- a/fpu/softfloat-macros.h +++ b/fpu/softfloat-macros.h @@ -55,7 +55,7 @@ these four paragraphs for those parts of this code that are retained. | The result is stored in the location pointed to by `zPtr'. *----------------------------------------------------------------------------*/ -INLINE void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) +static inline void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) { uint32_t z; @@ -81,7 +81,7 @@ INLINE void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) | The result is stored in the location pointed to by `zPtr'. *----------------------------------------------------------------------------*/ -INLINE void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) +static inline void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) { uint64_t z; @@ -115,7 +115,7 @@ INLINE void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) | described above, and is returned at the location pointed to by `z1Ptr'.) *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift64ExtraRightJamming( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -152,7 +152,7 @@ INLINE void | which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128Right( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -187,7 +187,7 @@ INLINE void | the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128RightJamming( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -238,7 +238,7 @@ INLINE void | `z2Ptr'.) *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128ExtraRightJamming( uint64_t a0, uint64_t a1, @@ -296,7 +296,7 @@ INLINE void | pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shortShift128Left( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -315,7 +315,7 @@ INLINE void | `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shortShift192Left( uint64_t a0, uint64_t a1, @@ -350,7 +350,7 @@ INLINE void | are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void add128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1, uint64_t *z0Ptr, uint64_t *z1Ptr ) { @@ -370,7 +370,7 @@ INLINE void | `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void add192( uint64_t a0, uint64_t a1, @@ -408,7 +408,7 @@ INLINE void | `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void sub128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1, uint64_t *z0Ptr, uint64_t *z1Ptr ) { @@ -426,7 +426,7 @@ INLINE void | pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void sub192( uint64_t a0, uint64_t a1, @@ -462,7 +462,7 @@ INLINE void | `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr ) +static inline void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr ) { uint32_t aHigh, aLow, bHigh, bLow; uint64_t z0, zMiddleA, zMiddleB, z1; @@ -492,7 +492,7 @@ INLINE void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr | `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void mul128By64To192( uint64_t a0, uint64_t a1, @@ -520,7 +520,7 @@ INLINE void | the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void mul128To256( uint64_t a0, uint64_t a1, @@ -702,7 +702,7 @@ static int8 countLeadingZeros64( uint64_t a ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 == b0 ) && ( a1 == b1 ); @@ -715,7 +715,7 @@ INLINE flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) ); @@ -728,7 +728,7 @@ INLINE flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | returns 0. *----------------------------------------------------------------------------*/ -INLINE flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) ); @@ -741,7 +741,7 @@ INLINE flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag ne128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag ne128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 != b0 ) || ( a1 != b1 ); diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e00a6fb..9274ebf 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -66,7 +66,7 @@ these four paragraphs for those parts of this code that are retained. | Returns the fraction bits of the half-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint32_t extractFloat16Frac(float16 a) +static inline uint32_t extractFloat16Frac(float16 a) { return float16_val(a) & 0x3ff; } @@ -75,7 +75,7 @@ INLINE uint32_t extractFloat16Frac(float16 a) | Returns the exponent bits of the half-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat16Exp(float16 a) +static inline int_fast16_t extractFloat16Exp(float16 a) { return (float16_val(a) >> 10) & 0x1f; } @@ -84,7 +84,7 @@ INLINE int_fast16_t extractFloat16Exp(float16 a) | Returns the sign bit of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat16Sign(float16 a) +static inline flag extractFloat16Sign(float16 a) { return float16_val(a)>>15; } @@ -255,7 +255,7 @@ static int64 roundAndPackUint64(flag zSign, uint64_t absZ0, | Returns the fraction bits of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint32_t extractFloat32Frac( float32 a ) +static inline uint32_t extractFloat32Frac( float32 a ) { return float32_val(a) & 0x007FFFFF; @@ -266,7 +266,7 @@ INLINE uint32_t extractFloat32Frac( float32 a ) | Returns the exponent bits of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat32Exp(float32 a) +static inline int_fast16_t extractFloat32Exp(float32 a) { return ( float32_val(a)>>23 ) & 0xFF; @@ -277,7 +277,7 @@ INLINE int_fast16_t extractFloat32Exp(float32 a) | Returns the sign bit of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat32Sign( float32 a ) +static inline flag extractFloat32Sign( float32 a ) { return float32_val(a)>>31; @@ -328,7 +328,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float32 packFloat32(flag zSign, int_fast16_t zExp, uint32_t zSig) +static inline float32 packFloat32(flag zSign, int_fast16_t zExp, uint32_t zSig) { return make_float32( @@ -440,7 +440,7 @@ static float32 | Returns the fraction bits of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat64Frac( float64 a ) +static inline uint64_t extractFloat64Frac( float64 a ) { return float64_val(a) & LIT64( 0x000FFFFFFFFFFFFF ); @@ -451,7 +451,7 @@ INLINE uint64_t extractFloat64Frac( float64 a ) | Returns the exponent bits of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat64Exp(float64 a) +static inline int_fast16_t extractFloat64Exp(float64 a) { return ( float64_val(a)>>52 ) & 0x7FF; @@ -462,7 +462,7 @@ INLINE int_fast16_t extractFloat64Exp(float64 a) | Returns the sign bit of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat64Sign( float64 a ) +static inline flag extractFloat64Sign( float64 a ) { return float64_val(a)>>63; @@ -513,7 +513,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float64 packFloat64(flag zSign, int_fast16_t zExp, uint64_t zSig) +static inline float64 packFloat64(flag zSign, int_fast16_t zExp, uint64_t zSig) { return make_float64( @@ -625,7 +625,7 @@ static float64 | value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloatx80Frac( floatx80 a ) +static inline uint64_t extractFloatx80Frac( floatx80 a ) { return a.low; @@ -637,7 +637,7 @@ INLINE uint64_t extractFloatx80Frac( floatx80 a ) | value `a'. *----------------------------------------------------------------------------*/ -INLINE int32 extractFloatx80Exp( floatx80 a ) +static inline int32 extractFloatx80Exp( floatx80 a ) { return a.high & 0x7FFF; @@ -649,7 +649,7 @@ INLINE int32 extractFloatx80Exp( floatx80 a ) | `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloatx80Sign( floatx80 a ) +static inline flag extractFloatx80Sign( floatx80 a ) { return a.high>>15; @@ -679,7 +679,7 @@ static void | extended double-precision floating-point value, returning the result. *----------------------------------------------------------------------------*/ -INLINE floatx80 packFloatx80( flag zSign, int32 zExp, uint64_t zSig ) +static inline floatx80 packFloatx80( flag zSign, int32 zExp, uint64_t zSig ) { floatx80 z; @@ -921,7 +921,7 @@ static floatx80 | floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat128Frac1( float128 a ) +static inline uint64_t extractFloat128Frac1( float128 a ) { return a.low; @@ -933,7 +933,7 @@ INLINE uint64_t extractFloat128Frac1( float128 a ) | floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat128Frac0( float128 a ) +static inline uint64_t extractFloat128Frac0( float128 a ) { return a.high & LIT64( 0x0000FFFFFFFFFFFF ); @@ -945,7 +945,7 @@ INLINE uint64_t extractFloat128Frac0( float128 a ) | `a'. *----------------------------------------------------------------------------*/ -INLINE int32 extractFloat128Exp( float128 a ) +static inline int32 extractFloat128Exp( float128 a ) { return ( a.high>>48 ) & 0x7FFF; @@ -956,7 +956,7 @@ INLINE int32 extractFloat128Exp( float128 a ) | Returns the sign bit of the quadruple-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat128Sign( float128 a ) +static inline flag extractFloat128Sign( float128 a ) { return a.high>>63; @@ -1017,7 +1017,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float128 +static inline float128 packFloat128( flag zSign, int32 zExp, uint64_t zSig0, uint64_t zSig1 ) { float128 z; @@ -7088,7 +7088,7 @@ uint64_t float64_to_uint64_round_to_zero (float64 a STATUS_PARAM) } #define COMPARE(s, nan_exp) \ -INLINE int float ## s ## _compare_internal( float ## s a, float ## s b, \ +static inline int float ## s ## _compare_internal( float ## s a, float ## s b, \ int is_quiet STATUS_PARAM ) \ { \ flag aSign, bSign; \ @@ -7140,7 +7140,7 @@ int float ## s ## _compare_quiet( float ## s a, float ## s b STATUS_PARAM ) \ COMPARE(32, 0xff) COMPARE(64, 0x7ff) -INLINE int floatx80_compare_internal( floatx80 a, floatx80 b, +static inline int floatx80_compare_internal( floatx80 a, floatx80 b, int is_quiet STATUS_PARAM ) { flag aSign, bSign; @@ -7186,7 +7186,7 @@ int floatx80_compare_quiet( floatx80 a, floatx80 b STATUS_PARAM ) return floatx80_compare_internal(a, b, 1 STATUS_VAR); } -INLINE int float128_compare_internal( float128 a, float128 b, +static inline int float128_compare_internal( float128 a, float128 b, int is_quiet STATUS_PARAM ) { flag aSign, bSign; @@ -7242,7 +7242,7 @@ int float128_compare_quiet( float128 a, float128 b STATUS_PARAM ) * semantics provided by many CPUs which predate that specification. */ #define MINMAX(s) \ -INLINE float ## s float ## s ## _minmax(float ## s a, float ## s b, \ +static inline float ## s float ## s ## _minmax(float ## s a, float ## s b, \ int ismin, int isieee STATUS_PARAM) \ { \ flag aSign, bSign; \ diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 4b3090c..77177c5 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -63,7 +63,6 @@ typedef uint64_t uint64; typedef int64_t int64; #define LIT64( a ) a##LL -#define INLINE static inline #define STATUS_PARAM , float_status *status #define STATUS(field) status->field @@ -181,59 +180,59 @@ typedef struct float_status { flag default_nan_mode; } float_status; -INLINE void set_float_detect_tininess(int val STATUS_PARAM) +static inline void set_float_detect_tininess(int val STATUS_PARAM) { STATUS(float_detect_tininess) = val; } -INLINE void set_float_rounding_mode(int val STATUS_PARAM) +static inline void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; } -INLINE void set_float_exception_flags(int val STATUS_PARAM) +static inline void set_float_exception_flags(int val STATUS_PARAM) { STATUS(float_exception_flags) = val; } -INLINE void set_floatx80_rounding_precision(int val STATUS_PARAM) +static inline void set_floatx80_rounding_precision(int val STATUS_PARAM) { STATUS(floatx80_rounding_precision) = val; } -INLINE void set_flush_to_zero(flag val STATUS_PARAM) +static inline void set_flush_to_zero(flag val STATUS_PARAM) { STATUS(flush_to_zero) = val; } -INLINE void set_flush_inputs_to_zero(flag val STATUS_PARAM) +static inline void set_flush_inputs_to_zero(flag val STATUS_PARAM) { STATUS(flush_inputs_to_zero) = val; } -INLINE void set_default_nan_mode(flag val STATUS_PARAM) +static inline void set_default_nan_mode(flag val STATUS_PARAM) { STATUS(default_nan_mode) = val; } -INLINE int get_float_detect_tininess(float_status *status) +static inline int get_float_detect_tininess(float_status *status) { return STATUS(float_detect_tininess); } -INLINE int get_float_rounding_mode(float_status *status) +static inline int get_float_rounding_mode(float_status *status) { return STATUS(float_rounding_mode); } -INLINE int get_float_exception_flags(float_status *status) +static inline int get_float_exception_flags(float_status *status) { return STATUS(float_exception_flags); } -INLINE int get_floatx80_rounding_precision(float_status *status) +static inline int get_floatx80_rounding_precision(float_status *status) { return STATUS(floatx80_rounding_precision); } -INLINE flag get_flush_to_zero(float_status *status) +static inline flag get_flush_to_zero(float_status *status) { return STATUS(flush_to_zero); } -INLINE flag get_flush_inputs_to_zero(float_status *status) +static inline flag get_flush_inputs_to_zero(float_status *status) { return STATUS(flush_inputs_to_zero); } -INLINE flag get_default_nan_mode(float_status *status) +static inline flag get_default_nan_mode(float_status *status) { return STATUS(default_nan_mode); } @@ -284,22 +283,22 @@ float128 int64_to_float128(int64_t STATUS_PARAM); float128 uint64_to_float128(uint64_t STATUS_PARAM); /* We provide the int16 versions for symmetry of API with float-to-int */ -INLINE float32 int16_to_float32(int16_t v STATUS_PARAM) +static inline float32 int16_to_float32(int16_t v STATUS_PARAM) { return int32_to_float32(v STATUS_VAR); } -INLINE float32 uint16_to_float32(uint16_t v STATUS_PARAM) +static inline float32 uint16_to_float32(uint16_t v STATUS_PARAM) { return uint32_to_float32(v STATUS_VAR); } -INLINE float64 int16_to_float64(int16_t v STATUS_PARAM) +static inline float64 int16_to_float64(int16_t v STATUS_PARAM) { return int32_to_float64(v STATUS_VAR); } -INLINE float64 uint16_to_float64(uint16_t v STATUS_PARAM) +static inline float64 uint16_to_float64(uint16_t v STATUS_PARAM) { return uint32_to_float64(v STATUS_VAR); } @@ -319,7 +318,7 @@ int float16_is_quiet_nan( float16 ); int float16_is_signaling_nan( float16 ); float16 float16_maybe_silence_nan( float16 ); -INLINE int float16_is_any_nan(float16 a) +static inline int float16_is_any_nan(float16 a) { return ((float16_val(a) & ~0x8000) > 0x7c00); } @@ -380,7 +379,7 @@ int float32_is_signaling_nan( float32 ); float32 float32_maybe_silence_nan( float32 ); float32 float32_scalbn( float32, int STATUS_PARAM ); -INLINE float32 float32_abs(float32 a) +static inline float32 float32_abs(float32 a) { /* Note that abs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -388,7 +387,7 @@ INLINE float32 float32_abs(float32 a) return make_float32(float32_val(a) & 0x7fffffff); } -INLINE float32 float32_chs(float32 a) +static inline float32 float32_chs(float32 a) { /* Note that chs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -396,32 +395,32 @@ INLINE float32 float32_chs(float32 a) return make_float32(float32_val(a) ^ 0x80000000); } -INLINE int float32_is_infinity(float32 a) +static inline int float32_is_infinity(float32 a) { return (float32_val(a) & 0x7fffffff) == 0x7f800000; } -INLINE int float32_is_neg(float32 a) +static inline int float32_is_neg(float32 a) { return float32_val(a) >> 31; } -INLINE int float32_is_zero(float32 a) +static inline int float32_is_zero(float32 a) { return (float32_val(a) & 0x7fffffff) == 0; } -INLINE int float32_is_any_nan(float32 a) +static inline int float32_is_any_nan(float32 a) { return ((float32_val(a) & ~(1 << 31)) > 0x7f800000UL); } -INLINE int float32_is_zero_or_denormal(float32 a) +static inline int float32_is_zero_or_denormal(float32 a) { return (float32_val(a) & 0x7f800000) == 0; } -INLINE float32 float32_set_sign(float32 a, int sign) +static inline float32 float32_set_sign(float32 a, int sign) { return make_float32((float32_val(a) & 0x7fffffff) | (sign << 31)); } @@ -490,7 +489,7 @@ int float64_is_signaling_nan( float64 ); float64 float64_maybe_silence_nan( float64 ); float64 float64_scalbn( float64, int STATUS_PARAM ); -INLINE float64 float64_abs(float64 a) +static inline float64 float64_abs(float64 a) { /* Note that abs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -498,7 +497,7 @@ INLINE float64 float64_abs(float64 a) return make_float64(float64_val(a) & 0x7fffffffffffffffLL); } -INLINE float64 float64_chs(float64 a) +static inline float64 float64_chs(float64 a) { /* Note that chs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -506,32 +505,32 @@ INLINE float64 float64_chs(float64 a) return make_float64(float64_val(a) ^ 0x8000000000000000LL); } -INLINE int float64_is_infinity(float64 a) +static inline int float64_is_infinity(float64 a) { return (float64_val(a) & 0x7fffffffffffffffLL ) == 0x7ff0000000000000LL; } -INLINE int float64_is_neg(float64 a) +static inline int float64_is_neg(float64 a) { return float64_val(a) >> 63; } -INLINE int float64_is_zero(float64 a) +static inline int float64_is_zero(float64 a) { return (float64_val(a) & 0x7fffffffffffffffLL) == 0; } -INLINE int float64_is_any_nan(float64 a) +static inline int float64_is_any_nan(float64 a) { return ((float64_val(a) & ~(1ULL << 63)) > 0x7ff0000000000000ULL); } -INLINE int float64_is_zero_or_denormal(float64 a) +static inline int float64_is_zero_or_denormal(float64 a) { return (float64_val(a) & 0x7ff0000000000000LL) == 0; } -INLINE float64 float64_set_sign(float64 a, int sign) +static inline float64 float64_set_sign(float64 a, int sign) { return make_float64((float64_val(a) & 0x7fffffffffffffffULL) | ((int64_t)sign << 63)); @@ -585,39 +584,39 @@ int floatx80_is_signaling_nan( floatx80 ); floatx80 floatx80_maybe_silence_nan( floatx80 ); floatx80 floatx80_scalbn( floatx80, int STATUS_PARAM ); -INLINE floatx80 floatx80_abs(floatx80 a) +static inline floatx80 floatx80_abs(floatx80 a) { a.high &= 0x7fff; return a; } -INLINE floatx80 floatx80_chs(floatx80 a) +static inline floatx80 floatx80_chs(floatx80 a) { a.high ^= 0x8000; return a; } -INLINE int floatx80_is_infinity(floatx80 a) +static inline int floatx80_is_infinity(floatx80 a) { return (a.high & 0x7fff) == 0x7fff && a.low == 0x8000000000000000LL; } -INLINE int floatx80_is_neg(floatx80 a) +static inline int floatx80_is_neg(floatx80 a) { return a.high >> 15; } -INLINE int floatx80_is_zero(floatx80 a) +static inline int floatx80_is_zero(floatx80 a) { return (a.high & 0x7fff) == 0 && a.low == 0; } -INLINE int floatx80_is_zero_or_denormal(floatx80 a) +static inline int floatx80_is_zero_or_denormal(floatx80 a) { return (a.high & 0x7fff) == 0; } -INLINE int floatx80_is_any_nan(floatx80 a) +static inline int floatx80_is_any_nan(floatx80 a) { return ((a.high & 0x7fff) == 0x7fff) && (a.low<<1); } @@ -670,39 +669,39 @@ int float128_is_signaling_nan( float128 ); float128 float128_maybe_silence_nan( float128 ); float128 float128_scalbn( float128, int STATUS_PARAM ); -INLINE float128 float128_abs(float128 a) +static inline float128 float128_abs(float128 a) { a.high &= 0x7fffffffffffffffLL; return a; } -INLINE float128 float128_chs(float128 a) +static inline float128 float128_chs(float128 a) { a.high ^= 0x8000000000000000LL; return a; } -INLINE int float128_is_infinity(float128 a) +static inline int float128_is_infinity(float128 a) { return (a.high & 0x7fffffffffffffffLL) == 0x7fff000000000000LL && a.low == 0; } -INLINE int float128_is_neg(float128 a) +static inline int float128_is_neg(float128 a) { return a.high >> 63; } -INLINE int float128_is_zero(float128 a) +static inline int float128_is_zero(float128 a) { return (a.high & 0x7fffffffffffffffLL) == 0 && a.low == 0; } -INLINE int float128_is_zero_or_denormal(float128 a) +static inline int float128_is_zero_or_denormal(float128 a) { return (a.high & 0x7fff000000000000LL) == 0; } -INLINE int float128_is_any_nan(float128 a) +static inline int float128_is_any_nan(float128 a) { return ((a.high >> 48) & 0x7fff) == 0x7fff && ((a.low != 0) || ((a.high & 0xffffffffffffLL) != 0)); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jul 20 09:22:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Jul 2014 09:22: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 1X8nJz-00085u-P5; Sun, 20 Jul 2014 09:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJy-00085h-5o for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:18 +0000 Received: from [85.158.139.211:44571] by server-1.bemta-5.messagelabs.com id A8/C5-15869-94A8BC35; Sun, 20 Jul 2014 09:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405848134!12345025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8810 invoked from network); 20 Jul 2014 09:22:15 -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 Jul 2014 09:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X8nJu-0002pO-Gr for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X8nJu-0003bC-2S for xen-changelog@lists.xensource.com; Sun, 20 Jul 2014 09:22:14 +0000 Date: Sun, 20 Jul 2014 09:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fpu: softfloat: drop INLINE 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 779640a3f4f58633e8575a534838ec79b4982107 Author: Luiz Capitulino AuthorDate: Thu Jun 19 10:13:43 2014 -0400 Commit: Stefano Stabellini CommitDate: Fri Jul 18 17:19:30 2014 +0000 fpu: softfloat: drop INLINE macro This commit expands all uses of the INLINE macro and drop it. The reason for this is to avoid clashes with external libraries with bad name conventions and also because renaming keywords is not a good practice. PS: I'm fine with this change to be licensed under softfloat-2a or softfloat-2b. Signed-off-by: Luiz Capitulino --- fpu/softfloat-macros.h | 38 +++++++++--------- fpu/softfloat.c | 48 +++++++++++----------- include/fpu/softfloat.h | 99 +++++++++++++++++++++++------------------------ 3 files changed, 92 insertions(+), 93 deletions(-) diff --git a/fpu/softfloat-macros.h b/fpu/softfloat-macros.h index 9b09545..0dcda93 100644 --- a/fpu/softfloat-macros.h +++ b/fpu/softfloat-macros.h @@ -55,7 +55,7 @@ these four paragraphs for those parts of this code that are retained. | The result is stored in the location pointed to by `zPtr'. *----------------------------------------------------------------------------*/ -INLINE void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) +static inline void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) { uint32_t z; @@ -81,7 +81,7 @@ INLINE void shift32RightJamming(uint32_t a, int_fast16_t count, uint32_t *zPtr) | The result is stored in the location pointed to by `zPtr'. *----------------------------------------------------------------------------*/ -INLINE void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) +static inline void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) { uint64_t z; @@ -115,7 +115,7 @@ INLINE void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t *zPtr) | described above, and is returned at the location pointed to by `z1Ptr'.) *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift64ExtraRightJamming( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -152,7 +152,7 @@ INLINE void | which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128Right( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -187,7 +187,7 @@ INLINE void | the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128RightJamming( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -238,7 +238,7 @@ INLINE void | `z2Ptr'.) *----------------------------------------------------------------------------*/ -INLINE void +static inline void shift128ExtraRightJamming( uint64_t a0, uint64_t a1, @@ -296,7 +296,7 @@ INLINE void | pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shortShift128Left( uint64_t a0, uint64_t a1, int_fast16_t count, uint64_t *z0Ptr, uint64_t *z1Ptr) { @@ -315,7 +315,7 @@ INLINE void | `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void shortShift192Left( uint64_t a0, uint64_t a1, @@ -350,7 +350,7 @@ INLINE void | are stored at the locations pointed to by `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void add128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1, uint64_t *z0Ptr, uint64_t *z1Ptr ) { @@ -370,7 +370,7 @@ INLINE void | `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void add192( uint64_t a0, uint64_t a1, @@ -408,7 +408,7 @@ INLINE void | `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void sub128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1, uint64_t *z0Ptr, uint64_t *z1Ptr ) { @@ -426,7 +426,7 @@ INLINE void | pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void sub192( uint64_t a0, uint64_t a1, @@ -462,7 +462,7 @@ INLINE void | `z0Ptr' and `z1Ptr'. *----------------------------------------------------------------------------*/ -INLINE void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr ) +static inline void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr ) { uint32_t aHigh, aLow, bHigh, bLow; uint64_t z0, zMiddleA, zMiddleB, z1; @@ -492,7 +492,7 @@ INLINE void mul64To128( uint64_t a, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr | `z2Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void mul128By64To192( uint64_t a0, uint64_t a1, @@ -520,7 +520,7 @@ INLINE void | the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'. *----------------------------------------------------------------------------*/ -INLINE void +static inline void mul128To256( uint64_t a0, uint64_t a1, @@ -702,7 +702,7 @@ static int8 countLeadingZeros64( uint64_t a ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 == b0 ) && ( a1 == b1 ); @@ -715,7 +715,7 @@ INLINE flag eq128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) ); @@ -728,7 +728,7 @@ INLINE flag le128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | returns 0. *----------------------------------------------------------------------------*/ -INLINE flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) ); @@ -741,7 +741,7 @@ INLINE flag lt128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) | Otherwise, returns 0. *----------------------------------------------------------------------------*/ -INLINE flag ne128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) +static inline flag ne128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) { return ( a0 != b0 ) || ( a1 != b1 ); diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e00a6fb..9274ebf 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -66,7 +66,7 @@ these four paragraphs for those parts of this code that are retained. | Returns the fraction bits of the half-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint32_t extractFloat16Frac(float16 a) +static inline uint32_t extractFloat16Frac(float16 a) { return float16_val(a) & 0x3ff; } @@ -75,7 +75,7 @@ INLINE uint32_t extractFloat16Frac(float16 a) | Returns the exponent bits of the half-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat16Exp(float16 a) +static inline int_fast16_t extractFloat16Exp(float16 a) { return (float16_val(a) >> 10) & 0x1f; } @@ -84,7 +84,7 @@ INLINE int_fast16_t extractFloat16Exp(float16 a) | Returns the sign bit of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat16Sign(float16 a) +static inline flag extractFloat16Sign(float16 a) { return float16_val(a)>>15; } @@ -255,7 +255,7 @@ static int64 roundAndPackUint64(flag zSign, uint64_t absZ0, | Returns the fraction bits of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint32_t extractFloat32Frac( float32 a ) +static inline uint32_t extractFloat32Frac( float32 a ) { return float32_val(a) & 0x007FFFFF; @@ -266,7 +266,7 @@ INLINE uint32_t extractFloat32Frac( float32 a ) | Returns the exponent bits of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat32Exp(float32 a) +static inline int_fast16_t extractFloat32Exp(float32 a) { return ( float32_val(a)>>23 ) & 0xFF; @@ -277,7 +277,7 @@ INLINE int_fast16_t extractFloat32Exp(float32 a) | Returns the sign bit of the single-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat32Sign( float32 a ) +static inline flag extractFloat32Sign( float32 a ) { return float32_val(a)>>31; @@ -328,7 +328,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float32 packFloat32(flag zSign, int_fast16_t zExp, uint32_t zSig) +static inline float32 packFloat32(flag zSign, int_fast16_t zExp, uint32_t zSig) { return make_float32( @@ -440,7 +440,7 @@ static float32 | Returns the fraction bits of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat64Frac( float64 a ) +static inline uint64_t extractFloat64Frac( float64 a ) { return float64_val(a) & LIT64( 0x000FFFFFFFFFFFFF ); @@ -451,7 +451,7 @@ INLINE uint64_t extractFloat64Frac( float64 a ) | Returns the exponent bits of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE int_fast16_t extractFloat64Exp(float64 a) +static inline int_fast16_t extractFloat64Exp(float64 a) { return ( float64_val(a)>>52 ) & 0x7FF; @@ -462,7 +462,7 @@ INLINE int_fast16_t extractFloat64Exp(float64 a) | Returns the sign bit of the double-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat64Sign( float64 a ) +static inline flag extractFloat64Sign( float64 a ) { return float64_val(a)>>63; @@ -513,7 +513,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float64 packFloat64(flag zSign, int_fast16_t zExp, uint64_t zSig) +static inline float64 packFloat64(flag zSign, int_fast16_t zExp, uint64_t zSig) { return make_float64( @@ -625,7 +625,7 @@ static float64 | value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloatx80Frac( floatx80 a ) +static inline uint64_t extractFloatx80Frac( floatx80 a ) { return a.low; @@ -637,7 +637,7 @@ INLINE uint64_t extractFloatx80Frac( floatx80 a ) | value `a'. *----------------------------------------------------------------------------*/ -INLINE int32 extractFloatx80Exp( floatx80 a ) +static inline int32 extractFloatx80Exp( floatx80 a ) { return a.high & 0x7FFF; @@ -649,7 +649,7 @@ INLINE int32 extractFloatx80Exp( floatx80 a ) | `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloatx80Sign( floatx80 a ) +static inline flag extractFloatx80Sign( floatx80 a ) { return a.high>>15; @@ -679,7 +679,7 @@ static void | extended double-precision floating-point value, returning the result. *----------------------------------------------------------------------------*/ -INLINE floatx80 packFloatx80( flag zSign, int32 zExp, uint64_t zSig ) +static inline floatx80 packFloatx80( flag zSign, int32 zExp, uint64_t zSig ) { floatx80 z; @@ -921,7 +921,7 @@ static floatx80 | floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat128Frac1( float128 a ) +static inline uint64_t extractFloat128Frac1( float128 a ) { return a.low; @@ -933,7 +933,7 @@ INLINE uint64_t extractFloat128Frac1( float128 a ) | floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE uint64_t extractFloat128Frac0( float128 a ) +static inline uint64_t extractFloat128Frac0( float128 a ) { return a.high & LIT64( 0x0000FFFFFFFFFFFF ); @@ -945,7 +945,7 @@ INLINE uint64_t extractFloat128Frac0( float128 a ) | `a'. *----------------------------------------------------------------------------*/ -INLINE int32 extractFloat128Exp( float128 a ) +static inline int32 extractFloat128Exp( float128 a ) { return ( a.high>>48 ) & 0x7FFF; @@ -956,7 +956,7 @@ INLINE int32 extractFloat128Exp( float128 a ) | Returns the sign bit of the quadruple-precision floating-point value `a'. *----------------------------------------------------------------------------*/ -INLINE flag extractFloat128Sign( float128 a ) +static inline flag extractFloat128Sign( float128 a ) { return a.high>>63; @@ -1017,7 +1017,7 @@ static void | significand. *----------------------------------------------------------------------------*/ -INLINE float128 +static inline float128 packFloat128( flag zSign, int32 zExp, uint64_t zSig0, uint64_t zSig1 ) { float128 z; @@ -7088,7 +7088,7 @@ uint64_t float64_to_uint64_round_to_zero (float64 a STATUS_PARAM) } #define COMPARE(s, nan_exp) \ -INLINE int float ## s ## _compare_internal( float ## s a, float ## s b, \ +static inline int float ## s ## _compare_internal( float ## s a, float ## s b, \ int is_quiet STATUS_PARAM ) \ { \ flag aSign, bSign; \ @@ -7140,7 +7140,7 @@ int float ## s ## _compare_quiet( float ## s a, float ## s b STATUS_PARAM ) \ COMPARE(32, 0xff) COMPARE(64, 0x7ff) -INLINE int floatx80_compare_internal( floatx80 a, floatx80 b, +static inline int floatx80_compare_internal( floatx80 a, floatx80 b, int is_quiet STATUS_PARAM ) { flag aSign, bSign; @@ -7186,7 +7186,7 @@ int floatx80_compare_quiet( floatx80 a, floatx80 b STATUS_PARAM ) return floatx80_compare_internal(a, b, 1 STATUS_VAR); } -INLINE int float128_compare_internal( float128 a, float128 b, +static inline int float128_compare_internal( float128 a, float128 b, int is_quiet STATUS_PARAM ) { flag aSign, bSign; @@ -7242,7 +7242,7 @@ int float128_compare_quiet( float128 a, float128 b STATUS_PARAM ) * semantics provided by many CPUs which predate that specification. */ #define MINMAX(s) \ -INLINE float ## s float ## s ## _minmax(float ## s a, float ## s b, \ +static inline float ## s float ## s ## _minmax(float ## s a, float ## s b, \ int ismin, int isieee STATUS_PARAM) \ { \ flag aSign, bSign; \ diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 4b3090c..77177c5 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -63,7 +63,6 @@ typedef uint64_t uint64; typedef int64_t int64; #define LIT64( a ) a##LL -#define INLINE static inline #define STATUS_PARAM , float_status *status #define STATUS(field) status->field @@ -181,59 +180,59 @@ typedef struct float_status { flag default_nan_mode; } float_status; -INLINE void set_float_detect_tininess(int val STATUS_PARAM) +static inline void set_float_detect_tininess(int val STATUS_PARAM) { STATUS(float_detect_tininess) = val; } -INLINE void set_float_rounding_mode(int val STATUS_PARAM) +static inline void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; } -INLINE void set_float_exception_flags(int val STATUS_PARAM) +static inline void set_float_exception_flags(int val STATUS_PARAM) { STATUS(float_exception_flags) = val; } -INLINE void set_floatx80_rounding_precision(int val STATUS_PARAM) +static inline void set_floatx80_rounding_precision(int val STATUS_PARAM) { STATUS(floatx80_rounding_precision) = val; } -INLINE void set_flush_to_zero(flag val STATUS_PARAM) +static inline void set_flush_to_zero(flag val STATUS_PARAM) { STATUS(flush_to_zero) = val; } -INLINE void set_flush_inputs_to_zero(flag val STATUS_PARAM) +static inline void set_flush_inputs_to_zero(flag val STATUS_PARAM) { STATUS(flush_inputs_to_zero) = val; } -INLINE void set_default_nan_mode(flag val STATUS_PARAM) +static inline void set_default_nan_mode(flag val STATUS_PARAM) { STATUS(default_nan_mode) = val; } -INLINE int get_float_detect_tininess(float_status *status) +static inline int get_float_detect_tininess(float_status *status) { return STATUS(float_detect_tininess); } -INLINE int get_float_rounding_mode(float_status *status) +static inline int get_float_rounding_mode(float_status *status) { return STATUS(float_rounding_mode); } -INLINE int get_float_exception_flags(float_status *status) +static inline int get_float_exception_flags(float_status *status) { return STATUS(float_exception_flags); } -INLINE int get_floatx80_rounding_precision(float_status *status) +static inline int get_floatx80_rounding_precision(float_status *status) { return STATUS(floatx80_rounding_precision); } -INLINE flag get_flush_to_zero(float_status *status) +static inline flag get_flush_to_zero(float_status *status) { return STATUS(flush_to_zero); } -INLINE flag get_flush_inputs_to_zero(float_status *status) +static inline flag get_flush_inputs_to_zero(float_status *status) { return STATUS(flush_inputs_to_zero); } -INLINE flag get_default_nan_mode(float_status *status) +static inline flag get_default_nan_mode(float_status *status) { return STATUS(default_nan_mode); } @@ -284,22 +283,22 @@ float128 int64_to_float128(int64_t STATUS_PARAM); float128 uint64_to_float128(uint64_t STATUS_PARAM); /* We provide the int16 versions for symmetry of API with float-to-int */ -INLINE float32 int16_to_float32(int16_t v STATUS_PARAM) +static inline float32 int16_to_float32(int16_t v STATUS_PARAM) { return int32_to_float32(v STATUS_VAR); } -INLINE float32 uint16_to_float32(uint16_t v STATUS_PARAM) +static inline float32 uint16_to_float32(uint16_t v STATUS_PARAM) { return uint32_to_float32(v STATUS_VAR); } -INLINE float64 int16_to_float64(int16_t v STATUS_PARAM) +static inline float64 int16_to_float64(int16_t v STATUS_PARAM) { return int32_to_float64(v STATUS_VAR); } -INLINE float64 uint16_to_float64(uint16_t v STATUS_PARAM) +static inline float64 uint16_to_float64(uint16_t v STATUS_PARAM) { return uint32_to_float64(v STATUS_VAR); } @@ -319,7 +318,7 @@ int float16_is_quiet_nan( float16 ); int float16_is_signaling_nan( float16 ); float16 float16_maybe_silence_nan( float16 ); -INLINE int float16_is_any_nan(float16 a) +static inline int float16_is_any_nan(float16 a) { return ((float16_val(a) & ~0x8000) > 0x7c00); } @@ -380,7 +379,7 @@ int float32_is_signaling_nan( float32 ); float32 float32_maybe_silence_nan( float32 ); float32 float32_scalbn( float32, int STATUS_PARAM ); -INLINE float32 float32_abs(float32 a) +static inline float32 float32_abs(float32 a) { /* Note that abs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -388,7 +387,7 @@ INLINE float32 float32_abs(float32 a) return make_float32(float32_val(a) & 0x7fffffff); } -INLINE float32 float32_chs(float32 a) +static inline float32 float32_chs(float32 a) { /* Note that chs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -396,32 +395,32 @@ INLINE float32 float32_chs(float32 a) return make_float32(float32_val(a) ^ 0x80000000); } -INLINE int float32_is_infinity(float32 a) +static inline int float32_is_infinity(float32 a) { return (float32_val(a) & 0x7fffffff) == 0x7f800000; } -INLINE int float32_is_neg(float32 a) +static inline int float32_is_neg(float32 a) { return float32_val(a) >> 31; } -INLINE int float32_is_zero(float32 a) +static inline int float32_is_zero(float32 a) { return (float32_val(a) & 0x7fffffff) == 0; } -INLINE int float32_is_any_nan(float32 a) +static inline int float32_is_any_nan(float32 a) { return ((float32_val(a) & ~(1 << 31)) > 0x7f800000UL); } -INLINE int float32_is_zero_or_denormal(float32 a) +static inline int float32_is_zero_or_denormal(float32 a) { return (float32_val(a) & 0x7f800000) == 0; } -INLINE float32 float32_set_sign(float32 a, int sign) +static inline float32 float32_set_sign(float32 a, int sign) { return make_float32((float32_val(a) & 0x7fffffff) | (sign << 31)); } @@ -490,7 +489,7 @@ int float64_is_signaling_nan( float64 ); float64 float64_maybe_silence_nan( float64 ); float64 float64_scalbn( float64, int STATUS_PARAM ); -INLINE float64 float64_abs(float64 a) +static inline float64 float64_abs(float64 a) { /* Note that abs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -498,7 +497,7 @@ INLINE float64 float64_abs(float64 a) return make_float64(float64_val(a) & 0x7fffffffffffffffLL); } -INLINE float64 float64_chs(float64 a) +static inline float64 float64_chs(float64 a) { /* Note that chs does *not* handle NaN specially, nor does * it flush denormal inputs to zero. @@ -506,32 +505,32 @@ INLINE float64 float64_chs(float64 a) return make_float64(float64_val(a) ^ 0x8000000000000000LL); } -INLINE int float64_is_infinity(float64 a) +static inline int float64_is_infinity(float64 a) { return (float64_val(a) & 0x7fffffffffffffffLL ) == 0x7ff0000000000000LL; } -INLINE int float64_is_neg(float64 a) +static inline int float64_is_neg(float64 a) { return float64_val(a) >> 63; } -INLINE int float64_is_zero(float64 a) +static inline int float64_is_zero(float64 a) { return (float64_val(a) & 0x7fffffffffffffffLL) == 0; } -INLINE int float64_is_any_nan(float64 a) +static inline int float64_is_any_nan(float64 a) { return ((float64_val(a) & ~(1ULL << 63)) > 0x7ff0000000000000ULL); } -INLINE int float64_is_zero_or_denormal(float64 a) +static inline int float64_is_zero_or_denormal(float64 a) { return (float64_val(a) & 0x7ff0000000000000LL) == 0; } -INLINE float64 float64_set_sign(float64 a, int sign) +static inline float64 float64_set_sign(float64 a, int sign) { return make_float64((float64_val(a) & 0x7fffffffffffffffULL) | ((int64_t)sign << 63)); @@ -585,39 +584,39 @@ int floatx80_is_signaling_nan( floatx80 ); floatx80 floatx80_maybe_silence_nan( floatx80 ); floatx80 floatx80_scalbn( floatx80, int STATUS_PARAM ); -INLINE floatx80 floatx80_abs(floatx80 a) +static inline floatx80 floatx80_abs(floatx80 a) { a.high &= 0x7fff; return a; } -INLINE floatx80 floatx80_chs(floatx80 a) +static inline floatx80 floatx80_chs(floatx80 a) { a.high ^= 0x8000; return a; } -INLINE int floatx80_is_infinity(floatx80 a) +static inline int floatx80_is_infinity(floatx80 a) { return (a.high & 0x7fff) == 0x7fff && a.low == 0x8000000000000000LL; } -INLINE int floatx80_is_neg(floatx80 a) +static inline int floatx80_is_neg(floatx80 a) { return a.high >> 15; } -INLINE int floatx80_is_zero(floatx80 a) +static inline int floatx80_is_zero(floatx80 a) { return (a.high & 0x7fff) == 0 && a.low == 0; } -INLINE int floatx80_is_zero_or_denormal(floatx80 a) +static inline int floatx80_is_zero_or_denormal(floatx80 a) { return (a.high & 0x7fff) == 0; } -INLINE int floatx80_is_any_nan(floatx80 a) +static inline int floatx80_is_any_nan(floatx80 a) { return ((a.high & 0x7fff) == 0x7fff) && (a.low<<1); } @@ -670,39 +669,39 @@ int float128_is_signaling_nan( float128 ); float128 float128_maybe_silence_nan( float128 ); float128 float128_scalbn( float128, int STATUS_PARAM ); -INLINE float128 float128_abs(float128 a) +static inline float128 float128_abs(float128 a) { a.high &= 0x7fffffffffffffffLL; return a; } -INLINE float128 float128_chs(float128 a) +static inline float128 float128_chs(float128 a) { a.high ^= 0x8000000000000000LL; return a; } -INLINE int float128_is_infinity(float128 a) +static inline int float128_is_infinity(float128 a) { return (a.high & 0x7fffffffffffffffLL) == 0x7fff000000000000LL && a.low == 0; } -INLINE int float128_is_neg(float128 a) +static inline int float128_is_neg(float128 a) { return a.high >> 63; } -INLINE int float128_is_zero(float128 a) +static inline int float128_is_zero(float128 a) { return (a.high & 0x7fffffffffffffffLL) == 0 && a.low == 0; } -INLINE int float128_is_zero_or_denormal(float128 a) +static inline int float128_is_zero_or_denormal(float128 a) { return (a.high & 0x7fff000000000000LL) == 0; } -INLINE int float128_is_any_nan(float128 a) +static inline int float128_is_any_nan(float128 a) { return ((a.high >> 48) & 0x7fff) == 0x7fff && ((a.low != 0) || ((a.high & 0xffffffffffffLL) != 0)); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 22 03:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:00: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 1X9QJK-0007NW-MI; Tue, 22 Jul 2014 03:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJJ-0007NR-HQ for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:13 +0000 Content-Length: 2799 Received: from [85.158.139.211:61930] by server-1.bemta-5.messagelabs.com id 21/33-15869-CB3DDC35; Tue, 22 Jul 2014 03:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1405998010!13843473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25926 invoked from network); 22 Jul 2014 03:00:11 -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; 22 Jul 2014 03:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJB-0003jq-CY for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJA-0002P6-Kp for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:04 +0000 Date: Tue, 22 Jul 2014 03:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] extras/mini-os/tpmback.c: fix compilation 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: multipart/mixed; boundary="===============5029412968193565078==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5029412968193565078== Content-Length: 2406 Content-Transfer-Encoding: quoted-printable commit c30018c884b7285465a27f960c6068ea7373a5db Author: Dushyant Behl AuthorDate: Mon Jul 21 02:22:59 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jul 21 12:10:46 2014 +0100 extras/mini-os/tpmback.c: fix compilation error. This patch is with respect to the following discussion on xen-devel - http://lists.xenproject.org/archives/html/xen-devel/2014-07/msg01991.html The file extras/mini-os/tpmback.c was failing compilation on certain compilers because of size mismatch between enum and int. Earlier the code used to read value of enum using %d format, which failed compilation on some compilers: tpmback.c: In function =E2=80=98tpmif_change_state=E2=80=99: tpmback.c:350:4: error: format =E2=80=98%d=E2=80=99 expects argument of type =E2=80=98int *=E2=80=99, but argument 3 has type =E2=80=98enum xenbus_state *=E2=80=99 [-Werror=3Dformat=3D] if(sscanf(value, "%d", &readst) !=3D 1) { ^ Now the value is read into an actual int variable and then assigned to the enum. Signed-off-by:- Dushyant Behl Acked-by: Samuel Thibault [ ijc -- added the actual error to the commit log ] --- extras/mini-os/tpmback.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c index 0601eb3..31da8d5 100644 --- a/extras/mini-os/tpmback.c +++ b/extras/mini-os/tpmback.c @@ -332,6 +332,7 @@ error_post_irq: * returns 0 on success and non-zero on error */ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) { + int tempst; char path[512]; char *value; char *err; @@ -347,11 +348,12 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) free(err); return -1; } - if(sscanf(value, "%d", &readst) !=3D 1) { + if(sscanf(value, "%d", &tempst) !=3D 1) { TPMBACK_ERR("Non integer value (%s) in %s =3F=3F\n", value, path); free(value); return -1; } + readst =3D (enum xenbus_state) tempst; free(value); /* It's possible that the backend state got updated by hotplug or something else behind our back */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5029412968193565078== 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 --===============5029412968193565078==-- From xen-changelog-bounces@lists.xen.org Tue Jul 22 03:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:00: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 1X9QJK-0007NW-MI; Tue, 22 Jul 2014 03:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJJ-0007NR-HQ for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:13 +0000 Content-Length: 2799 Received: from [85.158.139.211:61930] by server-1.bemta-5.messagelabs.com id 21/33-15869-CB3DDC35; Tue, 22 Jul 2014 03:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1405998010!13843473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25926 invoked from network); 22 Jul 2014 03:00:11 -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; 22 Jul 2014 03:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJB-0003jq-CY for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJA-0002P6-Kp for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:04 +0000 Date: Tue, 22 Jul 2014 03:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] extras/mini-os/tpmback.c: fix compilation 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: multipart/mixed; boundary="===============5029412968193565078==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5029412968193565078== Content-Length: 2406 Content-Transfer-Encoding: quoted-printable commit c30018c884b7285465a27f960c6068ea7373a5db Author: Dushyant Behl AuthorDate: Mon Jul 21 02:22:59 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jul 21 12:10:46 2014 +0100 extras/mini-os/tpmback.c: fix compilation error. This patch is with respect to the following discussion on xen-devel - http://lists.xenproject.org/archives/html/xen-devel/2014-07/msg01991.html The file extras/mini-os/tpmback.c was failing compilation on certain compilers because of size mismatch between enum and int. Earlier the code used to read value of enum using %d format, which failed compilation on some compilers: tpmback.c: In function =E2=80=98tpmif_change_state=E2=80=99: tpmback.c:350:4: error: format =E2=80=98%d=E2=80=99 expects argument of type =E2=80=98int *=E2=80=99, but argument 3 has type =E2=80=98enum xenbus_state *=E2=80=99 [-Werror=3Dformat=3D] if(sscanf(value, "%d", &readst) !=3D 1) { ^ Now the value is read into an actual int variable and then assigned to the enum. Signed-off-by:- Dushyant Behl Acked-by: Samuel Thibault [ ijc -- added the actual error to the commit log ] --- extras/mini-os/tpmback.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c index 0601eb3..31da8d5 100644 --- a/extras/mini-os/tpmback.c +++ b/extras/mini-os/tpmback.c @@ -332,6 +332,7 @@ error_post_irq: * returns 0 on success and non-zero on error */ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) { + int tempst; char path[512]; char *value; char *err; @@ -347,11 +348,12 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) free(err); return -1; } - if(sscanf(value, "%d", &readst) !=3D 1) { + if(sscanf(value, "%d", &tempst) !=3D 1) { TPMBACK_ERR("Non integer value (%s) in %s =3F=3F\n", value, path); free(value); return -1; } + readst =3D (enum xenbus_state) tempst; free(value); /* It's possible that the backend state got updated by hotplug or something else behind our back */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5029412968193565078== 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 --===============5029412968193565078==-- From xen-changelog-bounces@lists.xen.org Tue Jul 22 03:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJW-0007OD-Vx; Tue, 22 Jul 2014 03:00:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJV-0007Ny-FT for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:25 +0000 Received: from [85.158.143.35:54011] by server-1.bemta-4.messagelabs.com id 1F/BC-30046-8C3DDC35; Tue, 22 Jul 2014 03:00:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1405998021!19219780!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12439 invoked from network); 22 Jul 2014 03:00:22 -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 Jul 2014 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJQ-0003jt-Mv for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJQ-0002Pk-Gt for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:20 +0000 Date: Tue, 22 Jul 2014 03:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid reusing incorrect mappings when walking the p2m. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 964fd5a99c13c707c0c3355743ed1fadf88fc9d9 Author: Ian Campbell AuthorDate: Fri Jul 18 14:33:59 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:15:25 2014 +0100 xen: arm: avoid reusing incorrect mappings when walking the p2m. When we change which PT page we are mapping at a given level then we need to invalidate any cached mappings further down the tree, otherwise we risk using them because their offset might match but be based on a different offset further up the table. e.g. when remapping first then cur_first_offset and cur_second_offset (which indicate the currently mapped second and third tables respectively) both become invalid Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2f855b5..8ffddac 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -743,6 +743,8 @@ static int apply_p2m_changes(struct domain *d, goto out; } cur_first_page = p2m_first_level_index(addr); + /* Any mapping further down is now invalid */ + cur_first_offset = cur_second_offset = ~0; } /* We only use a 3 level p2m at the moment, so no level 0, @@ -765,6 +767,8 @@ static int apply_p2m_changes(struct domain *d, if (second) unmap_domain_page(second); second = map_domain_page(first[first_table_offset(addr)].p2m.base); cur_first_offset = first_table_offset(addr); + /* Any mapping further down is now invalid */ + cur_second_offset = ~0; } /* else: second already valid */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJW-0007OD-Vx; Tue, 22 Jul 2014 03:00:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJV-0007Ny-FT for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:25 +0000 Received: from [85.158.143.35:54011] by server-1.bemta-4.messagelabs.com id 1F/BC-30046-8C3DDC35; Tue, 22 Jul 2014 03:00:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1405998021!19219780!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12439 invoked from network); 22 Jul 2014 03:00:22 -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 Jul 2014 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJQ-0003jt-Mv for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJQ-0002Pk-Gt for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:20 +0000 Date: Tue, 22 Jul 2014 03:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid reusing incorrect mappings when walking the p2m. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 964fd5a99c13c707c0c3355743ed1fadf88fc9d9 Author: Ian Campbell AuthorDate: Fri Jul 18 14:33:59 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:15:25 2014 +0100 xen: arm: avoid reusing incorrect mappings when walking the p2m. When we change which PT page we are mapping at a given level then we need to invalidate any cached mappings further down the tree, otherwise we risk using them because their offset might match but be based on a different offset further up the table. e.g. when remapping first then cur_first_offset and cur_second_offset (which indicate the currently mapped second and third tables respectively) both become invalid Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2f855b5..8ffddac 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -743,6 +743,8 @@ static int apply_p2m_changes(struct domain *d, goto out; } cur_first_page = p2m_first_level_index(addr); + /* Any mapping further down is now invalid */ + cur_first_offset = cur_second_offset = ~0; } /* We only use a 3 level p2m at the moment, so no level 0, @@ -765,6 +767,8 @@ static int apply_p2m_changes(struct domain *d, if (second) unmap_domain_page(second); second = map_domain_page(first[first_table_offset(addr)].p2m.base); cur_first_offset = first_table_offset(addr); + /* Any mapping further down is now invalid */ + cur_second_offset = ~0; } /* else: second already valid */ -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJf-0007Pi-3L; Tue, 22 Jul 2014 03: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 1X9QJd-0007PM-Jo for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:33 +0000 Received: from [85.158.139.211:44603] by server-4.bemta-5.messagelabs.com id 54/E1-06276-0D3DDC35; Tue, 22 Jul 2014 03:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405998031!12629222!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2041 invoked from network); 22 Jul 2014 03:00:32 -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 Jul 2014 03:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJb-0003k4-3L for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJa-0002QA-Rc for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:30 +0000 Date: Tue, 22 Jul 2014 03:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement generic multiboot compatibility strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a860dfeec090fe46d856b5d3fc6da28ccf7d1ba5 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:11 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:58 2014 +0100 xen: arm: implement generic multiboot compatibility strings This causes Xen to accept the more generic names specified in http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot as of 2014-06-06. These names are more generic than those proposed by Andre in http://thread.gmane.org/gmane.linux.linaro.announce.boot/326 and those used in earlier drafts of the /Multiboot wiki page. This will allow bootloaders to not special case Xen (or at least to reduce the amount which is required). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/common/device_tree.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 53f779a..3d18d7f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -340,9 +340,11 @@ static void __init process_multiboot_node(const void *fdt, int node, struct dt_mb_module *mod; int len; - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) nr = MOD_INITRD; else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) nr = MOD_XSM; @@ -435,7 +437,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJf-0007Pi-3L; Tue, 22 Jul 2014 03: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 1X9QJd-0007PM-Jo for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:33 +0000 Received: from [85.158.139.211:44603] by server-4.bemta-5.messagelabs.com id 54/E1-06276-0D3DDC35; Tue, 22 Jul 2014 03:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405998031!12629222!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2041 invoked from network); 22 Jul 2014 03:00:32 -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 Jul 2014 03:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJb-0003k4-3L for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJa-0002QA-Rc for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:30 +0000 Date: Tue, 22 Jul 2014 03:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement generic multiboot compatibility strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a860dfeec090fe46d856b5d3fc6da28ccf7d1ba5 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:11 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:58 2014 +0100 xen: arm: implement generic multiboot compatibility strings This causes Xen to accept the more generic names specified in http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot as of 2014-06-06. These names are more generic than those proposed by Andre in http://thread.gmane.org/gmane.linux.linaro.announce.boot/326 and those used in earlier drafts of the /Multiboot wiki page. This will allow bootloaders to not special case Xen (or at least to reduce the amount which is required). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/common/device_tree.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 53f779a..3d18d7f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -340,9 +340,11 @@ static void __init process_multiboot_node(const void *fdt, int node, struct dt_mb_module *mod; int len; - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) nr = MOD_INITRD; else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) nr = MOD_XSM; @@ -435,7 +437,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJp-0007RP-62; Tue, 22 Jul 2014 03:00:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJn-0007R7-OG for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:43 +0000 Received: from [85.158.139.211:43669] by server-9.bemta-5.messagelabs.com id B5/A5-26293-BD3DDC35; Tue, 22 Jul 2014 03:00:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1405998041!11385679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 525 invoked from network); 22 Jul 2014 03:00:42 -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 Jul 2014 03:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJl-0003kA-8F for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJl-0002QZ-70 for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:41 +0000 Date: Tue, 22 Jul 2014 03:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b677095ea6c70fffbd145dc6186be3706829b089 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:12 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated When using a multiboot capable bootloader this is exactly the field which should be used. Replace the deprecation wording with a reference to the information on the priority of the bootargs fields. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index a7fb52b..bfb8d01 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -25,8 +25,9 @@ Each node contains the following properties: - bootargs (optional) - Command line associated with this module. This is deprecated and should - be replaced by the bootargs variations described below. + Command line associated with this module. See below for the + priority of this field vs. other mechanisms of specifying the + bootargs for the kernel. Command lines -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03: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 1X9QJp-0007RP-62; Tue, 22 Jul 2014 03:00:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJn-0007R7-OG for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:43 +0000 Received: from [85.158.139.211:43669] by server-9.bemta-5.messagelabs.com id B5/A5-26293-BD3DDC35; Tue, 22 Jul 2014 03:00:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1405998041!11385679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 525 invoked from network); 22 Jul 2014 03:00:42 -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 Jul 2014 03:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJl-0003kA-8F for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJl-0002QZ-70 for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:41 +0000 Date: Tue, 22 Jul 2014 03:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b677095ea6c70fffbd145dc6186be3706829b089 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:12 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated When using a multiboot capable bootloader this is exactly the field which should be used. Replace the deprecation wording with a reference to the information on the priority of the bootargs fields. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index a7fb52b..bfb8d01 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -25,8 +25,9 @@ Each node contains the following properties: - bootargs (optional) - Command line associated with this module. This is deprecated and should - be replaced by the bootargs variations described below. + Command line associated with this module. See below for the + priority of this field vs. other mechanisms of specifying the + bootargs for the kernel. Command lines -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:00: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 1X9QK1-0007Te-9K; Tue, 22 Jul 2014 03:00:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJz-0007TQ-Ml for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:55 +0000 Received: from [193.109.254.147:56839] by server-11.bemta-14.messagelabs.com id 24/99-14213-7E3DDC35; Tue, 22 Jul 2014 03:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1405998051!18759786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28105 invoked from network); 22 Jul 2014 03:00:52 -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; 22 Jul 2014 03:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJv-0003kH-Ef for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJv-0002Qx-Cs for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:51 +0000 Date: Tue, 22 Jul 2014 03:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: prefer typesafe max()/min() over MAX()/MIN() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bedebbfe47b4cf192e231c76d7f2cb9b1c198b4 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:13 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: prefer typesafe max()/min() over MAX()/MIN() Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 4 ++-- xen/common/device_tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8ffddac..143199b 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -816,8 +816,8 @@ static int apply_p2m_changes(struct domain *d, unsigned long sgfn = paddr_to_pfn(start_gpaddr); unsigned long egfn = paddr_to_pfn(end_gpaddr); - p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn); - p2m->lowest_mapped_gfn = MIN(p2m->lowest_mapped_gfn, sgfn); + p2m->max_mapped_gfn = max(p2m->max_mapped_gfn, egfn); + p2m->lowest_mapped_gfn = min(p2m->lowest_mapped_gfn, sgfn); } rc = 0; diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d18d7f..dba2fba 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -427,7 +427,7 @@ static void __init process_chosen_node(const void *fdt, int node, mod->start = start; mod->size = end - start; - early_info.modules.nr_mods = MAX(MOD_INITRD, early_info.modules.nr_mods); + early_info.modules.nr_mods = max(MOD_INITRD, early_info.modules.nr_mods); } static int __init early_scan_node(const void *fdt, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:00:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:00: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 1X9QK1-0007Te-9K; Tue, 22 Jul 2014 03:00:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJz-0007TQ-Ml for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:55 +0000 Received: from [193.109.254.147:56839] by server-11.bemta-14.messagelabs.com id 24/99-14213-7E3DDC35; Tue, 22 Jul 2014 03:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1405998051!18759786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28105 invoked from network); 22 Jul 2014 03:00:52 -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; 22 Jul 2014 03:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QJv-0003kH-Ef for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QJv-0002Qx-Cs for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:00:51 +0000 Date: Tue, 22 Jul 2014 03:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: prefer typesafe max()/min() over MAX()/MIN() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bedebbfe47b4cf192e231c76d7f2cb9b1c198b4 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:13 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: prefer typesafe max()/min() over MAX()/MIN() Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 4 ++-- xen/common/device_tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8ffddac..143199b 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -816,8 +816,8 @@ static int apply_p2m_changes(struct domain *d, unsigned long sgfn = paddr_to_pfn(start_gpaddr); unsigned long egfn = paddr_to_pfn(end_gpaddr); - p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn); - p2m->lowest_mapped_gfn = MIN(p2m->lowest_mapped_gfn, sgfn); + p2m->max_mapped_gfn = max(p2m->max_mapped_gfn, egfn); + p2m->lowest_mapped_gfn = min(p2m->lowest_mapped_gfn, sgfn); } rc = 0; diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d18d7f..dba2fba 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -427,7 +427,7 @@ static void __init process_chosen_node(const void *fdt, int node, mod->start = start; mod->size = end - start; - early_info.modules.nr_mods = MAX(MOD_INITRD, early_info.modules.nr_mods); + early_info.modules.nr_mods = max(MOD_INITRD, early_info.modules.nr_mods); } static int __init early_scan_node(const void *fdt, -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKA-0007WG-D1; Tue, 22 Jul 2014 03:01:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QK8-0007Vr-VX for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:05 +0000 Received: from [85.158.139.211:64583] by server-17.bemta-5.messagelabs.com id 97/33-08085-0F3DDC35; Tue, 22 Jul 2014 03:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1405998061!16759337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3252 invoked from network); 22 Jul 2014 03:01:02 -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; 22 Jul 2014 03:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QK5-0003kS-KO for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QK5-0002Rt-Iw for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:01 +0000 Date: Tue, 22 Jul 2014 03:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename early_info structs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fa40c36742ac01e82d9fb3f5a6be1777b42a008 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:14 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: rename early_info structs There isn't really anything Device Tree specific about the early_info, we just happen to get it from device tree (but in the future it might come e.g. from UEFI or ACPI or something else). Move the relevant structs out of device_tree.h and into asm/setup.h and rename to be more neutral. For now the code to parse the DT into the now arch specific structs remains in common code. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 13 +++++----- xen/arch/arm/kernel.c | 6 ++-- xen/arch/arm/kernel.h | 3 +- xen/arch/arm/setup.c | 51 +++++++++++++++++++++------------------- xen/common/device_tree.c | 38 +++++++++++++++--------------- xen/include/asm-arm/setup.h | 40 ++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 39 ------------------------------- 7 files changed, 98 insertions(+), 92 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c58ad75..a065442 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -404,9 +405,9 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - if ( early_info.modules.nr_mods >= MOD_KERNEL && - early_info.modules.module[MOD_KERNEL].cmdline[0] ) - bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; + if ( bootinfo.modules.nr_mods >= MOD_KERNEL && + bootinfo.modules.module[MOD_KERNEL].cmdline[0] ) + bootargs = &bootinfo.modules.module[MOD_KERNEL].cmdline[0]; dt_for_each_property_node (node, prop) { @@ -465,7 +466,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * If the bootloader provides an initrd, we must create a placeholder * for the initrd properties. The values will be replaced later. */ - if ( early_info.modules.module[MOD_INITRD].size ) + if ( bootinfo.modules.module[MOD_INITRD].size ) { u64 a = 0; res = fdt_property(kinfo->fdt, "linux,initrd-start", &a, sizeof(a)); @@ -1221,8 +1222,8 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr = early_info.modules.module[MOD_INITRD].start; - paddr_t len = early_info.modules.module[MOD_INITRD].size; + paddr_t paddr = bootinfo.modules.module[MOD_INITRD].start; + paddr_t len = bootinfo.modules.module[MOD_INITRD].size; unsigned long offs; int node; int res; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 69182ec..ce5b95a 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -69,7 +69,7 @@ static void place_modules(struct kernel_info *info, { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ const paddr_t initrd_len = - ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); + ROUNDUP(bootinfo.modules.module[MOD_INITRD].size, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -376,8 +376,8 @@ int kernel_probe(struct kernel_info *info) paddr_t start, size; - start = early_info.modules.module[MOD_KERNEL].start; - size = early_info.modules.module[MOD_KERNEL].size; + start = bootinfo.modules.module[MOD_KERNEL].start; + size = bootinfo.modules.module[MOD_KERNEL].size; if ( !size ) { diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index fd2f61d..7c7f624 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -8,6 +8,7 @@ #include #include +#include struct kernel_info { #ifdef CONFIG_ARM_64 @@ -16,7 +17,7 @@ struct kernel_info { void *fdt; /* flat device tree */ paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ - struct dt_mem_info mem; + struct meminfo mem; /* kernel entry point */ paddr_t entry; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 78dc7f5..b1aa9c3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -43,8 +43,11 @@ #include #include #include +#include #include +struct bootinfo __initdata bootinfo; + struct cpuinfo_arm __read_mostly boot_cpu_data; static __used void init_done(void) @@ -182,7 +185,7 @@ static void dt_unreserved_regions(paddr_t s, paddr_t e, void __init discard_initial_modules(void) { - struct dt_module_info *mi = &early_info.modules; + struct bootmodules *mi = &bootinfo.modules; int i; for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) @@ -210,7 +213,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, uint32_t size, paddr_t align, int first_mod) { - const struct dt_module_info *mi = &early_info.modules; + const struct bootmodules *mi = &bootinfo.modules; int i; int nr_rsvd; @@ -275,7 +278,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, */ static paddr_t __init next_module(paddr_t s, paddr_t *end) { - struct dt_module_info *mi = &early_info.modules; + struct bootmodules *mi = &bootinfo.modules; paddr_t lowest = ~(paddr_t)0; int i; @@ -308,7 +311,7 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end) */ static paddr_t __init get_xen_paddr(void) { - struct dt_mem_info *mi = &early_info.mem; + struct meminfo *mi = &bootinfo.mem; paddr_t min_size; paddr_t paddr = 0, last_end; int i; @@ -357,8 +360,8 @@ static paddr_t __init get_xen_paddr(void) printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - early_info.modules.module[MOD_XEN].start = paddr; - early_info.modules.module[MOD_XEN].size = min_size; + bootinfo.modules.module[MOD_XEN].start = paddr; + bootinfo.modules.module[MOD_XEN].size = min_size; return paddr; } @@ -376,7 +379,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) int i; void *fdt; - if ( !early_info.mem.nr_banks ) + if ( !bootinfo.mem.nr_banks ) panic("No memory bank"); /* @@ -393,15 +396,15 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * We also track the number of actual RAM pages (i.e. not counting * the holes). */ - ram_size = early_info.mem.bank[0].size; + ram_size = bootinfo.mem.bank[0].size; - contig_start = ram_start = early_info.mem.bank[0].start; + contig_start = ram_start = bootinfo.mem.bank[0].start; contig_end = ram_end = ram_start + ram_size; - for ( i = 1; i < early_info.mem.nr_banks; i++ ) + for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = early_info.mem.bank[i].start; - paddr_t bank_size = early_info.mem.bank[i].size; + paddr_t bank_start = bootinfo.mem.bank[i].start; + paddr_t bank_size = bootinfo.mem.bank[i].size; paddr_t bank_end = bank_start + bank_size; paddr_t new_ram_size = ram_size + bank_size; @@ -434,11 +437,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) ram_end = new_ram_end; } - if ( i != early_info.mem.nr_banks ) + if ( i != bootinfo.mem.nr_banks ) { printk("WARNING: only using %d out of %d memory banks\n", - i, early_info.mem.nr_banks); - early_info.mem.nr_banks = i; + i, bootinfo.mem.nr_banks); + bootinfo.mem.nr_banks = i; } total_pages = ram_pages = ram_size >> PAGE_SHIFT; @@ -497,10 +500,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) device_tree_flattened = fdt; /* Add non-xenheap memory */ - for ( i = 0; i < early_info.mem.nr_banks; i++ ) + for ( i = 0; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = early_info.mem.bank[i].start; - paddr_t bank_end = bank_start + early_info.mem.bank[i].size; + paddr_t bank_start = bootinfo.mem.bank[i].start; + paddr_t bank_end = bank_start + bootinfo.mem.bank[i].size; s = bank_start; while ( s < bank_end ) @@ -557,10 +560,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) void *fdt; total_pages = 0; - for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ ) + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) { - paddr_t bank_start = early_info.mem.bank[bank].start; - paddr_t bank_size = early_info.mem.bank[bank].size; + paddr_t bank_start = bootinfo.mem.bank[bank].start; + paddr_t bank_size = bootinfo.mem.bank[bank].size; paddr_t bank_end = bank_start + bank_size; paddr_t s, e; @@ -609,11 +612,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) } } - if ( bank != early_info.mem.nr_banks ) + if ( bank != bootinfo.mem.nr_banks ) { printk("WARNING: only using %d out of %d memory banks\n", - bank, early_info.mem.nr_banks); - early_info.mem.nr_banks = bank; + bank, bootinfo.mem.nr_banks); + bootinfo.mem.nr_banks = bank; } total_pages += ram_size >> PAGE_SHIFT; diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index dba2fba..c0b2b95 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -23,8 +23,8 @@ #include #include #include +#include -struct dt_early_info __initdata early_info; const void *device_tree_flattened; dt_irq_xlate_func dt_irq_xlate; /* Host device tree */ @@ -238,10 +238,10 @@ const char *device_tree_bootargs(const void *fdt) prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); if ( prop == NULL ) { - struct dt_mb_module *dom0_mod = NULL; + struct bootmodule *dom0_mod = NULL; - if ( early_info.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &early_info.modules.module[MOD_KERNEL]; + if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) + dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || ( dom0_mod && dom0_mod->cmdline[0] ) ) @@ -319,14 +319,14 @@ static void __init process_memory_node(const void *fdt, int node, cell = (const __be32 *)prop->data; banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); - for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) + for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) { device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); if ( !size ) continue; - early_info.mem.bank[early_info.mem.nr_banks].start = start; - early_info.mem.bank[early_info.mem.nr_banks].size = size; - early_info.mem.nr_banks++; + bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; + bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; + bootinfo.mem.nr_banks++; } } @@ -337,7 +337,7 @@ static void __init process_multiboot_node(const void *fdt, int node, const struct fdt_property *prop; const __be32 *cell; int nr; - struct dt_mb_module *mod; + struct bootmodule *mod; int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || @@ -351,7 +351,7 @@ static void __init process_multiboot_node(const void *fdt, int node, else panic("%s not a known xen multiboot type\n", name); - mod = &early_info.modules.module[nr]; + mod = &bootinfo.modules.module[nr]; prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) @@ -376,8 +376,8 @@ static void __init process_multiboot_node(const void *fdt, int node, else mod->cmdline[0] = 0; - if ( nr > early_info.modules.nr_mods ) - early_info.modules.nr_mods = nr; + if ( nr > bootinfo.modules.nr_mods ) + bootinfo.modules.nr_mods = nr; } static void __init process_chosen_node(const void *fdt, int node, @@ -385,7 +385,7 @@ static void __init process_chosen_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - struct dt_mb_module *mod = &early_info.modules.module[MOD_INITRD]; + struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; paddr_t start, end; int len; @@ -427,7 +427,7 @@ static void __init process_chosen_node(const void *fdt, int node, mod->start = start; mod->size = end - start; - early_info.modules.nr_mods = max(MOD_INITRD, early_info.modules.nr_mods); + bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); } static int __init early_scan_node(const void *fdt, @@ -448,8 +448,8 @@ static int __init early_scan_node(const void *fdt, static void __init early_print_info(void) { - struct dt_mem_info *mi = &early_info.mem; - struct dt_module_info *mods = &early_info.modules; + struct meminfo *mi = &bootinfo.mem; + struct bootmodules *mods = &bootinfo.modules; int i, nr_rsvd; for ( i = 0; i < mi->nr_banks; i++ ) @@ -485,18 +485,18 @@ static void __init early_print_info(void) */ size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) { - struct dt_mb_module *mod; + struct bootmodule *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) panic("No valid device tree\n"); - mod = &early_info.modules.module[MOD_FDT]; + mod = &bootinfo.modules.module[MOD_FDT]; mod->start = paddr; mod->size = fdt_totalsize(fdt); - early_info.modules.nr_mods = max(MOD_FDT, early_info.modules.nr_mods); + bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index b09f688..ea0dc46 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -3,6 +3,46 @@ #include +#define NR_MEM_BANKS 8 + +#define MOD_XEN 0 +#define MOD_FDT 1 +#define MOD_KERNEL 2 +#define MOD_INITRD 3 +#define MOD_XSM 4 +#define NR_MODULES 5 + +#define MOD_DISCARD_FIRST MOD_FDT + +struct membank { + paddr_t start; + paddr_t size; +}; + +struct meminfo { + int nr_banks; + struct membank bank[NR_MEM_BANKS]; +}; + +struct bootmodule { + paddr_t start; + paddr_t size; + char cmdline[1024]; +}; + +struct bootmodules { + int nr_mods; + /* Module 0 is Xen itself, followed by the provided modules-proper */ + struct bootmodule module[NR_MODULES]; +}; + +struct bootinfo { + struct meminfo mem; + struct bootmodules modules; +}; + +extern struct bootinfo bootinfo; + void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 865e1ef..717ef55 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -20,44 +20,6 @@ #define DEVICE_TREE_MAX_DEPTH 16 -#define NR_MEM_BANKS 8 - -#define MOD_XEN 0 -#define MOD_FDT 1 -#define MOD_KERNEL 2 -#define MOD_INITRD 3 -#define MOD_XSM 4 -#define NR_MODULES 5 - -#define MOD_DISCARD_FIRST MOD_FDT - -struct membank { - paddr_t start; - paddr_t size; -}; - -struct dt_mem_info { - int nr_banks; - struct membank bank[NR_MEM_BANKS]; -}; - -struct dt_mb_module { - paddr_t start; - paddr_t size; - char cmdline[1024]; -}; - -struct dt_module_info { - int nr_mods; - /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct dt_mb_module module[NR_MODULES]; -}; - -struct dt_early_info { - struct dt_mem_info mem; - struct dt_module_info modules; -}; - /* * Struct used for matching a device */ @@ -195,7 +157,6 @@ typedef int (*device_tree_node_func)(const void *fdt, u32 address_cells, u32 size_cells, void *data); -extern struct dt_early_info early_info; extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKA-0007WG-D1; Tue, 22 Jul 2014 03:01:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QK8-0007Vr-VX for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:05 +0000 Received: from [85.158.139.211:64583] by server-17.bemta-5.messagelabs.com id 97/33-08085-0F3DDC35; Tue, 22 Jul 2014 03:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1405998061!16759337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3252 invoked from network); 22 Jul 2014 03:01:02 -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; 22 Jul 2014 03:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QK5-0003kS-KO for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QK5-0002Rt-Iw for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:01 +0000 Date: Tue, 22 Jul 2014 03:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename early_info structs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fa40c36742ac01e82d9fb3f5a6be1777b42a008 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:14 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: rename early_info structs There isn't really anything Device Tree specific about the early_info, we just happen to get it from device tree (but in the future it might come e.g. from UEFI or ACPI or something else). Move the relevant structs out of device_tree.h and into asm/setup.h and rename to be more neutral. For now the code to parse the DT into the now arch specific structs remains in common code. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 13 +++++----- xen/arch/arm/kernel.c | 6 ++-- xen/arch/arm/kernel.h | 3 +- xen/arch/arm/setup.c | 51 +++++++++++++++++++++------------------- xen/common/device_tree.c | 38 +++++++++++++++--------------- xen/include/asm-arm/setup.h | 40 ++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 39 ------------------------------- 7 files changed, 98 insertions(+), 92 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c58ad75..a065442 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -404,9 +405,9 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - if ( early_info.modules.nr_mods >= MOD_KERNEL && - early_info.modules.module[MOD_KERNEL].cmdline[0] ) - bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; + if ( bootinfo.modules.nr_mods >= MOD_KERNEL && + bootinfo.modules.module[MOD_KERNEL].cmdline[0] ) + bootargs = &bootinfo.modules.module[MOD_KERNEL].cmdline[0]; dt_for_each_property_node (node, prop) { @@ -465,7 +466,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * If the bootloader provides an initrd, we must create a placeholder * for the initrd properties. The values will be replaced later. */ - if ( early_info.modules.module[MOD_INITRD].size ) + if ( bootinfo.modules.module[MOD_INITRD].size ) { u64 a = 0; res = fdt_property(kinfo->fdt, "linux,initrd-start", &a, sizeof(a)); @@ -1221,8 +1222,8 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr = early_info.modules.module[MOD_INITRD].start; - paddr_t len = early_info.modules.module[MOD_INITRD].size; + paddr_t paddr = bootinfo.modules.module[MOD_INITRD].start; + paddr_t len = bootinfo.modules.module[MOD_INITRD].size; unsigned long offs; int node; int res; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 69182ec..ce5b95a 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -69,7 +69,7 @@ static void place_modules(struct kernel_info *info, { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ const paddr_t initrd_len = - ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); + ROUNDUP(bootinfo.modules.module[MOD_INITRD].size, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -376,8 +376,8 @@ int kernel_probe(struct kernel_info *info) paddr_t start, size; - start = early_info.modules.module[MOD_KERNEL].start; - size = early_info.modules.module[MOD_KERNEL].size; + start = bootinfo.modules.module[MOD_KERNEL].start; + size = bootinfo.modules.module[MOD_KERNEL].size; if ( !size ) { diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index fd2f61d..7c7f624 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -8,6 +8,7 @@ #include #include +#include struct kernel_info { #ifdef CONFIG_ARM_64 @@ -16,7 +17,7 @@ struct kernel_info { void *fdt; /* flat device tree */ paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ - struct dt_mem_info mem; + struct meminfo mem; /* kernel entry point */ paddr_t entry; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 78dc7f5..b1aa9c3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -43,8 +43,11 @@ #include #include #include +#include #include +struct bootinfo __initdata bootinfo; + struct cpuinfo_arm __read_mostly boot_cpu_data; static __used void init_done(void) @@ -182,7 +185,7 @@ static void dt_unreserved_regions(paddr_t s, paddr_t e, void __init discard_initial_modules(void) { - struct dt_module_info *mi = &early_info.modules; + struct bootmodules *mi = &bootinfo.modules; int i; for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) @@ -210,7 +213,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, uint32_t size, paddr_t align, int first_mod) { - const struct dt_module_info *mi = &early_info.modules; + const struct bootmodules *mi = &bootinfo.modules; int i; int nr_rsvd; @@ -275,7 +278,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, */ static paddr_t __init next_module(paddr_t s, paddr_t *end) { - struct dt_module_info *mi = &early_info.modules; + struct bootmodules *mi = &bootinfo.modules; paddr_t lowest = ~(paddr_t)0; int i; @@ -308,7 +311,7 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end) */ static paddr_t __init get_xen_paddr(void) { - struct dt_mem_info *mi = &early_info.mem; + struct meminfo *mi = &bootinfo.mem; paddr_t min_size; paddr_t paddr = 0, last_end; int i; @@ -357,8 +360,8 @@ static paddr_t __init get_xen_paddr(void) printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - early_info.modules.module[MOD_XEN].start = paddr; - early_info.modules.module[MOD_XEN].size = min_size; + bootinfo.modules.module[MOD_XEN].start = paddr; + bootinfo.modules.module[MOD_XEN].size = min_size; return paddr; } @@ -376,7 +379,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) int i; void *fdt; - if ( !early_info.mem.nr_banks ) + if ( !bootinfo.mem.nr_banks ) panic("No memory bank"); /* @@ -393,15 +396,15 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * We also track the number of actual RAM pages (i.e. not counting * the holes). */ - ram_size = early_info.mem.bank[0].size; + ram_size = bootinfo.mem.bank[0].size; - contig_start = ram_start = early_info.mem.bank[0].start; + contig_start = ram_start = bootinfo.mem.bank[0].start; contig_end = ram_end = ram_start + ram_size; - for ( i = 1; i < early_info.mem.nr_banks; i++ ) + for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = early_info.mem.bank[i].start; - paddr_t bank_size = early_info.mem.bank[i].size; + paddr_t bank_start = bootinfo.mem.bank[i].start; + paddr_t bank_size = bootinfo.mem.bank[i].size; paddr_t bank_end = bank_start + bank_size; paddr_t new_ram_size = ram_size + bank_size; @@ -434,11 +437,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) ram_end = new_ram_end; } - if ( i != early_info.mem.nr_banks ) + if ( i != bootinfo.mem.nr_banks ) { printk("WARNING: only using %d out of %d memory banks\n", - i, early_info.mem.nr_banks); - early_info.mem.nr_banks = i; + i, bootinfo.mem.nr_banks); + bootinfo.mem.nr_banks = i; } total_pages = ram_pages = ram_size >> PAGE_SHIFT; @@ -497,10 +500,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) device_tree_flattened = fdt; /* Add non-xenheap memory */ - for ( i = 0; i < early_info.mem.nr_banks; i++ ) + for ( i = 0; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = early_info.mem.bank[i].start; - paddr_t bank_end = bank_start + early_info.mem.bank[i].size; + paddr_t bank_start = bootinfo.mem.bank[i].start; + paddr_t bank_end = bank_start + bootinfo.mem.bank[i].size; s = bank_start; while ( s < bank_end ) @@ -557,10 +560,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) void *fdt; total_pages = 0; - for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ ) + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) { - paddr_t bank_start = early_info.mem.bank[bank].start; - paddr_t bank_size = early_info.mem.bank[bank].size; + paddr_t bank_start = bootinfo.mem.bank[bank].start; + paddr_t bank_size = bootinfo.mem.bank[bank].size; paddr_t bank_end = bank_start + bank_size; paddr_t s, e; @@ -609,11 +612,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) } } - if ( bank != early_info.mem.nr_banks ) + if ( bank != bootinfo.mem.nr_banks ) { printk("WARNING: only using %d out of %d memory banks\n", - bank, early_info.mem.nr_banks); - early_info.mem.nr_banks = bank; + bank, bootinfo.mem.nr_banks); + bootinfo.mem.nr_banks = bank; } total_pages += ram_size >> PAGE_SHIFT; diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index dba2fba..c0b2b95 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -23,8 +23,8 @@ #include #include #include +#include -struct dt_early_info __initdata early_info; const void *device_tree_flattened; dt_irq_xlate_func dt_irq_xlate; /* Host device tree */ @@ -238,10 +238,10 @@ const char *device_tree_bootargs(const void *fdt) prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); if ( prop == NULL ) { - struct dt_mb_module *dom0_mod = NULL; + struct bootmodule *dom0_mod = NULL; - if ( early_info.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &early_info.modules.module[MOD_KERNEL]; + if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) + dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || ( dom0_mod && dom0_mod->cmdline[0] ) ) @@ -319,14 +319,14 @@ static void __init process_memory_node(const void *fdt, int node, cell = (const __be32 *)prop->data; banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); - for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) + for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) { device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); if ( !size ) continue; - early_info.mem.bank[early_info.mem.nr_banks].start = start; - early_info.mem.bank[early_info.mem.nr_banks].size = size; - early_info.mem.nr_banks++; + bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; + bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; + bootinfo.mem.nr_banks++; } } @@ -337,7 +337,7 @@ static void __init process_multiboot_node(const void *fdt, int node, const struct fdt_property *prop; const __be32 *cell; int nr; - struct dt_mb_module *mod; + struct bootmodule *mod; int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || @@ -351,7 +351,7 @@ static void __init process_multiboot_node(const void *fdt, int node, else panic("%s not a known xen multiboot type\n", name); - mod = &early_info.modules.module[nr]; + mod = &bootinfo.modules.module[nr]; prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) @@ -376,8 +376,8 @@ static void __init process_multiboot_node(const void *fdt, int node, else mod->cmdline[0] = 0; - if ( nr > early_info.modules.nr_mods ) - early_info.modules.nr_mods = nr; + if ( nr > bootinfo.modules.nr_mods ) + bootinfo.modules.nr_mods = nr; } static void __init process_chosen_node(const void *fdt, int node, @@ -385,7 +385,7 @@ static void __init process_chosen_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - struct dt_mb_module *mod = &early_info.modules.module[MOD_INITRD]; + struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; paddr_t start, end; int len; @@ -427,7 +427,7 @@ static void __init process_chosen_node(const void *fdt, int node, mod->start = start; mod->size = end - start; - early_info.modules.nr_mods = max(MOD_INITRD, early_info.modules.nr_mods); + bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); } static int __init early_scan_node(const void *fdt, @@ -448,8 +448,8 @@ static int __init early_scan_node(const void *fdt, static void __init early_print_info(void) { - struct dt_mem_info *mi = &early_info.mem; - struct dt_module_info *mods = &early_info.modules; + struct meminfo *mi = &bootinfo.mem; + struct bootmodules *mods = &bootinfo.modules; int i, nr_rsvd; for ( i = 0; i < mi->nr_banks; i++ ) @@ -485,18 +485,18 @@ static void __init early_print_info(void) */ size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) { - struct dt_mb_module *mod; + struct bootmodule *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) panic("No valid device tree\n"); - mod = &early_info.modules.module[MOD_FDT]; + mod = &bootinfo.modules.module[MOD_FDT]; mod->start = paddr; mod->size = fdt_totalsize(fdt); - early_info.modules.nr_mods = max(MOD_FDT, early_info.modules.nr_mods); + bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index b09f688..ea0dc46 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -3,6 +3,46 @@ #include +#define NR_MEM_BANKS 8 + +#define MOD_XEN 0 +#define MOD_FDT 1 +#define MOD_KERNEL 2 +#define MOD_INITRD 3 +#define MOD_XSM 4 +#define NR_MODULES 5 + +#define MOD_DISCARD_FIRST MOD_FDT + +struct membank { + paddr_t start; + paddr_t size; +}; + +struct meminfo { + int nr_banks; + struct membank bank[NR_MEM_BANKS]; +}; + +struct bootmodule { + paddr_t start; + paddr_t size; + char cmdline[1024]; +}; + +struct bootmodules { + int nr_mods; + /* Module 0 is Xen itself, followed by the provided modules-proper */ + struct bootmodule module[NR_MODULES]; +}; + +struct bootinfo { + struct meminfo mem; + struct bootmodules modules; +}; + +extern struct bootinfo bootinfo; + void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 865e1ef..717ef55 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -20,44 +20,6 @@ #define DEVICE_TREE_MAX_DEPTH 16 -#define NR_MEM_BANKS 8 - -#define MOD_XEN 0 -#define MOD_FDT 1 -#define MOD_KERNEL 2 -#define MOD_INITRD 3 -#define MOD_XSM 4 -#define NR_MODULES 5 - -#define MOD_DISCARD_FIRST MOD_FDT - -struct membank { - paddr_t start; - paddr_t size; -}; - -struct dt_mem_info { - int nr_banks; - struct membank bank[NR_MEM_BANKS]; -}; - -struct dt_mb_module { - paddr_t start; - paddr_t size; - char cmdline[1024]; -}; - -struct dt_module_info { - int nr_mods; - /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct dt_mb_module module[NR_MODULES]; -}; - -struct dt_early_info { - struct dt_mem_info mem; - struct dt_module_info modules; -}; - /* * Struct used for matching a device */ @@ -195,7 +157,6 @@ typedef int (*device_tree_node_func)(const void *fdt, u32 address_cells, u32 size_cells, void *data); -extern struct dt_early_info early_info; extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKL-0007Y2-KY; Tue, 22 Jul 2014 03:01:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKJ-0007Xo-Js for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:15 +0000 Received: from [85.158.139.211:52479] by server-12.bemta-5.messagelabs.com id 19/87-11323-AF3DDC35; Tue, 22 Jul 2014 03:01:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405998072!12629299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4136 invoked from network); 22 Jul 2014 03:01:13 -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 Jul 2014 03:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKF-0003ky-Pc for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKF-0002SR-OS for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:11 +0000 Date: Tue, 22 Jul 2014 03:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move boot time fdt parsing into separate 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 e44e79545092ad62ce37172449c1782e7c41ce3c Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:15 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: move boot time fdt parsing into separate file. Move the early code for walking the flattened device tree out of device_tree.c. The intention is that eventually only the proper (i.e. unflattened) device tree support will live in device_tree.c. The new home is bootfdt.c to try and better reflect the purpose of the code. Although in theory this early code could be generic in reality it is pretty ARM specific, so place it under xen/arch/arm until a second user wants it. As part of the move rename device_tree_early_init to boot_fdt_info. Drop device_tree_dump, it is unused. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/bootfdt.c | 345 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 2 +- xen/common/device_tree.c | 358 ----------------------------------------- xen/include/asm-arm/setup.h | 2 + xen/include/xen/device_tree.h | 3 - 6 files changed, 349 insertions(+), 362 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 20f59f4..c13206f 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -21,6 +21,7 @@ obj-y += guestcopy.o obj-y += physdev.o obj-y += platform.o obj-y += setup.o +obj-y += bootfdt.o obj-y += time.o obj-y += smpboot.o obj-y += smp.o diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c new file mode 100644 index 0000000..bcf4882 --- /dev/null +++ b/xen/arch/arm/bootfdt.c @@ -0,0 +1,345 @@ +/* + * Early Device Tree + * + * Copyright (C) 2012-2014 Citrix Systems, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +static bool_t __init device_tree_node_matches(const void *fdt, int node, + const char *match) +{ + const char *name; + size_t match_len; + + name = fdt_get_name(fdt, node, NULL); + match_len = strlen(match); + + /* Match both "match" and "match@..." patterns but not + "match-foo". */ + return strncmp(name, match, match_len) == 0 + && (name[match_len] == '@' || name[match_len] == '\0'); +} + +static bool_t __init device_tree_node_compatible(const void *fdt, int node, + const char *match) +{ + int len, l; + int mlen; + const void *prop; + + mlen = strlen(match); + + prop = fdt_getprop(fdt, node, "compatible", &len); + if ( prop == NULL ) + return 0; + + while ( len > 0 ) { + if ( !dt_compat_cmp(prop, match) ) + return 1; + l = strlen(prop) + 1; + prop += l; + len -= l; + } + + return 0; +} + +static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, + u32 size_cells, u64 *start, u64 *size) +{ + *start = dt_next_cell(address_cells, cell); + *size = dt_next_cell(size_cells, cell); +} + +static u32 __init device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt) +{ + const struct fdt_property *prop; + + prop = fdt_get_property(fdt, node, prop_name, NULL); + if ( !prop || prop->len < sizeof(u32) ) + return dflt; + + return fdt32_to_cpu(*(uint32_t*)prop->data); +} + +/** + * device_tree_for_each_node - iterate over all device tree nodes + * @fdt: flat device tree. + * @func: function to call for each node. + * @data: data to pass to @func. + * + * Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. + * + * Returns 0 if all nodes were iterated over successfully. If @func + * returns a value different from 0, that value is returned immediately. + */ +static int __init device_tree_for_each_node(const void *fdt, + device_tree_node_func func, + void *data) +{ + int node; + int depth; + u32 address_cells[DEVICE_TREE_MAX_DEPTH]; + u32 size_cells[DEVICE_TREE_MAX_DEPTH]; + int ret; + + for ( node = 0, depth = 0; + node >=0 && depth >= 0; + node = fdt_next_node(fdt, node, &depth) ) + { + const char *name = fdt_get_name(fdt, node, NULL); + + if ( depth >= DEVICE_TREE_MAX_DEPTH ) + { + printk("Warning: device tree node `%s' is nested too deep\n", + name); + continue; + } + + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); + + + ret = func(fdt, node, name, depth, + address_cells[depth-1], size_cells[depth-1], data); + if ( ret != 0 ) + return ret; + } + return 0; +} + +static void __init process_memory_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + int i; + int banks; + const __be32 *cell; + paddr_t start, size; + u32 reg_cells = address_cells + size_cells; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: node `%s': invalid #address-cells or #size-cells", + name); + return; + } + + prop = fdt_get_property(fdt, node, "reg", NULL); + if ( !prop ) + { + printk("fdt: node `%s': missing `reg' property\n", name); + return; + } + + cell = (const __be32 *)prop->data; + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); + + for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) + { + device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( !size ) + continue; + bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; + bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; + bootinfo.mem.nr_banks++; + } +} + +static void __init process_multiboot_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const __be32 *cell; + int nr; + struct bootmodule *mod; + int len; + + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) + nr = MOD_KERNEL; + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) + nr = MOD_INITRD; + else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) + nr = MOD_XSM; + else + panic("%s not a known xen multiboot type\n", name); + + mod = &bootinfo.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "reg", &len); + if ( !prop ) + panic("node %s missing `reg' property\n", name); + + if ( len < dt_cells_to_size(address_cells + size_cells) ) + panic("fdt: node `%s': `reg` property length is too short\n", + name); + + cell = (const __be32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &mod->size); + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + + if ( nr > bootinfo.modules.nr_mods ) + bootinfo.modules.nr_mods = nr; +} + +static void __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; + paddr_t start, end; + int len; + + printk("Checking for initrd in /chosen\n"); + + prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); + if ( !prop ) + /* No initrd present. */ + return; + if ( len != sizeof(u32) && len != sizeof(u64) ) + { + printk("linux,initrd-start property has invalid length %d\n", len); + return; + } + start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); + + prop = fdt_get_property(fdt, node, "linux,initrd-end", &len); + if ( !prop ) + { + printk("linux,initrd-end not present but -start was\n"); + return; + } + if ( len != sizeof(u32) && len != sizeof(u64) ) + { + printk("linux,initrd-end property has invalid length %d\n", len); + return; + } + end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); + + if ( start >= end ) + { + printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", + start, end); + return; + } + + printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); + + mod->start = start; + mod->size = end - start; + + bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); +} + +static int __init early_scan_node(const void *fdt, + int node, const char *name, int depth, + u32 address_cells, u32 size_cells, + void *data) +{ + if ( device_tree_node_matches(fdt, node, "memory") ) + process_memory_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) + process_multiboot_node(fdt, node, name, address_cells, size_cells); + else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) + process_chosen_node(fdt, node, name, address_cells, size_cells); + + return 0; +} + +static void __init early_print_info(void) +{ + struct meminfo *mi = &bootinfo.mem; + struct bootmodules *mods = &bootinfo.modules; + int i, nr_rsvd; + + for ( i = 0; i < mi->nr_banks; i++ ) + printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", + mi->bank[i].start, + mi->bank[i].start + mi->bank[i].size - 1); + printk("\n"); + for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + i, + mods->module[i].start, + mods->module[i].start + mods->module[i].size, + mods->module[i].cmdline); + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + for ( i = 0; i < nr_rsvd; i++ ) + { + paddr_t s, e; + if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) + continue; + /* fdt_get_mem_rsv returns length */ + e += s; + printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", + i, s, e); + } + printk("\n"); +} + +/** + * boot_fdt_info - initialize bootinfo from a DTB + * @fdt: flattened device tree binary + * + * Returns the size of the DTB. + */ +size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) +{ + struct bootmodule *mod; + int ret; + + ret = fdt_check_header(fdt); + if ( ret < 0 ) + panic("No valid device tree\n"); + + mod = &bootinfo.modules.module[MOD_FDT]; + mod->start = paddr; + mod->size = fdt_totalsize(fdt); + + bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); + + device_tree_for_each_node((void *)fdt, early_scan_node, NULL); + early_print_info(); + + return fdt_totalsize(fdt); +} + +/* + * 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 b1aa9c3..05336d6 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -684,7 +684,7 @@ void __init start_xen(unsigned long boot_phys_offset, /* This is mapped by head.S */ device_tree_flattened = (void *)BOOT_FDT_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); - fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); + fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); cmdline = device_tree_bootargs(device_tree_flattened); printk("Command line: %s\n", cmdline); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index c0b2b95..689970d 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -22,7 +22,6 @@ #include #include #include -#include #include const void *device_tree_flattened; @@ -89,52 +88,6 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -static bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match) -{ - const char *name; - size_t match_len; - - name = fdt_get_name(fdt, node, NULL); - match_len = strlen(match); - - /* Match both "match" and "match@..." patterns but not - "match-foo". */ - return strncmp(name, match, match_len) == 0 - && (name[match_len] == '@' || name[match_len] == '\0'); -} - -static bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match) -{ - int len, l; - int mlen; - const void *prop; - - mlen = strlen(match); - - prop = fdt_getprop(fdt, node, "compatible", &len); - if ( prop == NULL ) - return 0; - - while ( len > 0 ) { - if ( !dt_compat_cmp(prop, match) ) - return 1; - l = strlen(prop) + 1; - prop += l; - len -= l; - } - - return 0; -} - -static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, - u32 size_cells, u64 *start, u64 *size) -{ - *start = dt_next_cell(address_cells, cell); - *size = dt_next_cell(size_cells, cell); -} - void dt_get_range(const __be32 **cell, const struct dt_device_node *np, u64 *address, u64 *size) { @@ -162,66 +115,6 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -static u32 __init device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt) -{ - const struct fdt_property *prop; - - prop = fdt_get_property(fdt, node, prop_name, NULL); - if ( !prop || prop->len < sizeof(u32) ) - return dflt; - - return fdt32_to_cpu(*(uint32_t*)prop->data); -} - -/** - * device_tree_for_each_node - iterate over all device tree nodes - * @fdt: flat device tree. - * @func: function to call for each node. - * @data: data to pass to @func. - * - * Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. - * - * Returns 0 if all nodes were iterated over successfully. If @func - * returns a value different from 0, that value is returned immediately. - */ -static int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, - void *data) -{ - int node; - int depth; - u32 address_cells[DEVICE_TREE_MAX_DEPTH]; - u32 size_cells[DEVICE_TREE_MAX_DEPTH]; - int ret; - - for ( node = 0, depth = 0; - node >=0 && depth >= 0; - node = fdt_next_node(fdt, node, &depth) ) - { - const char *name = fdt_get_name(fdt, node, NULL); - - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - { - printk("Warning: device tree node `%s' is nested too deep\n", - name); - continue; - } - - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", - depth > 0 ? address_cells[depth-1] : 0); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", - depth > 0 ? size_cells[depth-1] : 0); - - - ret = func(fdt, node, name, depth, - address_cells[depth-1], size_cells[depth-1], data); - if ( ret != 0 ) - return ret; - } - return 0; -} - /** * device_tree_bootargs - return the bootargs (the Xen command line) * @fdt flat device tree. @@ -253,257 +146,6 @@ const char *device_tree_bootargs(const void *fdt) return prop->data; } -static int dump_node(const void *fdt, int node, const char *name, int depth, - u32 address_cells, u32 size_cells, void *data) -{ - char prefix[2*DEVICE_TREE_MAX_DEPTH + 1] = ""; - int i; - int prop; - - for ( i = 0; i < depth; i++ ) - safe_strcat(prefix, " "); - - if ( name[0] == '\0' ) - name = "/"; - printk("%s%s:\n", prefix, name); - - for ( prop = fdt_first_property_offset(fdt, node); - prop >= 0; - prop = fdt_next_property_offset(fdt, prop) ) - { - const struct fdt_property *p; - - p = fdt_get_property_by_offset(fdt, prop, NULL); - - printk("%s %s\n", prefix, fdt_string(fdt, fdt32_to_cpu(p->nameoff))); - } - - return 0; -} - -/** - * device_tree_dump - print a text representation of a device tree - * @fdt: flat device tree to print - */ -void __init device_tree_dump(const void *fdt) -{ - device_tree_for_each_node(fdt, dump_node, NULL); -} - - -static void __init process_memory_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - int i; - int banks; - const __be32 *cell; - paddr_t start, size; - u32 reg_cells = address_cells + size_cells; - - if ( address_cells < 1 || size_cells < 1 ) - { - printk("fdt: node `%s': invalid #address-cells or #size-cells", - name); - return; - } - - prop = fdt_get_property(fdt, node, "reg", NULL); - if ( !prop ) - { - printk("fdt: node `%s': missing `reg' property\n", name); - return; - } - - cell = (const __be32 *)prop->data; - banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); - - for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) - { - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); - if ( !size ) - continue; - bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; - bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; - bootinfo.mem.nr_banks++; - } -} - -static void __init process_multiboot_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - const __be32 *cell; - int nr; - struct bootmodule *mod; - int len; - - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || - fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) - nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || - fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) - nr = MOD_INITRD; - else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) - nr = MOD_XSM; - else - panic("%s not a known xen multiboot type\n", name); - - mod = &bootinfo.modules.module[nr]; - - prop = fdt_get_property(fdt, node, "reg", &len); - if ( !prop ) - panic("node %s missing `reg' property\n", name); - - if ( len < dt_cells_to_size(address_cells + size_cells) ) - panic("fdt: node `%s': `reg` property length is too short\n", - name); - - cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &mod->start, &mod->size); - - prop = fdt_get_property(fdt, node, "bootargs", &len); - if ( prop ) - { - if ( len > sizeof(mod->cmdline) ) - panic("module %d command line too long\n", nr); - - safe_strcpy(mod->cmdline, prop->data); - } - else - mod->cmdline[0] = 0; - - if ( nr > bootinfo.modules.nr_mods ) - bootinfo.modules.nr_mods = nr; -} - -static void __init process_chosen_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; - paddr_t start, end; - int len; - - printk("Checking for initrd in /chosen\n"); - - prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); - if ( !prop ) - /* No initrd present. */ - return; - if ( len != sizeof(u32) && len != sizeof(u64) ) - { - printk("linux,initrd-start property has invalid length %d\n", len); - return; - } - start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); - - prop = fdt_get_property(fdt, node, "linux,initrd-end", &len); - if ( !prop ) - { - printk("linux,initrd-end not present but -start was\n"); - return; - } - if ( len != sizeof(u32) && len != sizeof(u64) ) - { - printk("linux,initrd-end property has invalid length %d\n", len); - return; - } - end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); - - if ( start >= end ) - { - printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", - start, end); - return; - } - - printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); - - mod->start = start; - mod->size = end - start; - - bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); -} - -static int __init early_scan_node(const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells, - void *data) -{ - if ( device_tree_node_matches(fdt, node, "memory") ) - process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || - device_tree_node_compatible(fdt, node, "multiboot,module" )) - process_multiboot_node(fdt, node, name, address_cells, size_cells); - else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) - process_chosen_node(fdt, node, name, address_cells, size_cells); - - return 0; -} - -static void __init early_print_info(void) -{ - struct meminfo *mi = &bootinfo.mem; - struct bootmodules *mods = &bootinfo.modules; - int i, nr_rsvd; - - for ( i = 0; i < mi->nr_banks; i++ ) - printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", - mi->bank[i].start, - mi->bank[i].start + mi->bank[i].size - 1); - printk("\n"); - for ( i = 1 ; i < mods->nr_mods + 1; i++ ) - printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", - i, - mods->module[i].start, - mods->module[i].start + mods->module[i].size, - mods->module[i].cmdline); - nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); - for ( i = 0; i < nr_rsvd; i++ ) - { - paddr_t s, e; - if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) - continue; - /* fdt_get_mem_rsv returns length */ - e += s; - printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", - i, s, e); - } - printk("\n"); -} - -/** - * device_tree_early_init - initialize early info from a DTB - * @fdt: flattened device tree binary - * - * Returns the size of the DTB. - */ -size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) -{ - struct bootmodule *mod; - int ret; - - ret = fdt_check_header(fdt); - if ( ret < 0 ) - panic("No valid device tree\n"); - - mod = &bootinfo.modules.module[MOD_FDT]; - mod->start = paddr; - mod->size = fdt_totalsize(fdt); - - bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); - - device_tree_for_each_node((void *)fdt, early_scan_node, NULL); - early_print_info(); - - return fdt_totalsize(fdt); -} - static void __init *unflatten_dt_alloc(unsigned long *mem, unsigned long size, unsigned long align) { diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index ea0dc46..21dbcd4 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -53,6 +53,8 @@ int construct_dom0(struct domain *d); void discard_initial_modules(void); +size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); + #endif /* * Local variables: diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 717ef55..7e6ab6b 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -159,10 +159,7 @@ typedef int (*device_tree_node_func)(const void *fdt, extern const void *device_tree_flattened; -size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); - const char __init *device_tree_bootargs(const void *fdt); -void __init device_tree_dump(const void *fdt); /** * dt_unflatten_host_device_tree - Unflatten the host device tree -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKL-0007Y2-KY; Tue, 22 Jul 2014 03:01:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKJ-0007Xo-Js for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:15 +0000 Received: from [85.158.139.211:52479] by server-12.bemta-5.messagelabs.com id 19/87-11323-AF3DDC35; Tue, 22 Jul 2014 03:01:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1405998072!12629299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4136 invoked from network); 22 Jul 2014 03:01:13 -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 Jul 2014 03:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKF-0003ky-Pc for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKF-0002SR-OS for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:11 +0000 Date: Tue, 22 Jul 2014 03:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move boot time fdt parsing into separate 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 e44e79545092ad62ce37172449c1782e7c41ce3c Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:15 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: move boot time fdt parsing into separate file. Move the early code for walking the flattened device tree out of device_tree.c. The intention is that eventually only the proper (i.e. unflattened) device tree support will live in device_tree.c. The new home is bootfdt.c to try and better reflect the purpose of the code. Although in theory this early code could be generic in reality it is pretty ARM specific, so place it under xen/arch/arm until a second user wants it. As part of the move rename device_tree_early_init to boot_fdt_info. Drop device_tree_dump, it is unused. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/bootfdt.c | 345 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 2 +- xen/common/device_tree.c | 358 ----------------------------------------- xen/include/asm-arm/setup.h | 2 + xen/include/xen/device_tree.h | 3 - 6 files changed, 349 insertions(+), 362 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 20f59f4..c13206f 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -21,6 +21,7 @@ obj-y += guestcopy.o obj-y += physdev.o obj-y += platform.o obj-y += setup.o +obj-y += bootfdt.o obj-y += time.o obj-y += smpboot.o obj-y += smp.o diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c new file mode 100644 index 0000000..bcf4882 --- /dev/null +++ b/xen/arch/arm/bootfdt.c @@ -0,0 +1,345 @@ +/* + * Early Device Tree + * + * Copyright (C) 2012-2014 Citrix Systems, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +static bool_t __init device_tree_node_matches(const void *fdt, int node, + const char *match) +{ + const char *name; + size_t match_len; + + name = fdt_get_name(fdt, node, NULL); + match_len = strlen(match); + + /* Match both "match" and "match@..." patterns but not + "match-foo". */ + return strncmp(name, match, match_len) == 0 + && (name[match_len] == '@' || name[match_len] == '\0'); +} + +static bool_t __init device_tree_node_compatible(const void *fdt, int node, + const char *match) +{ + int len, l; + int mlen; + const void *prop; + + mlen = strlen(match); + + prop = fdt_getprop(fdt, node, "compatible", &len); + if ( prop == NULL ) + return 0; + + while ( len > 0 ) { + if ( !dt_compat_cmp(prop, match) ) + return 1; + l = strlen(prop) + 1; + prop += l; + len -= l; + } + + return 0; +} + +static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, + u32 size_cells, u64 *start, u64 *size) +{ + *start = dt_next_cell(address_cells, cell); + *size = dt_next_cell(size_cells, cell); +} + +static u32 __init device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt) +{ + const struct fdt_property *prop; + + prop = fdt_get_property(fdt, node, prop_name, NULL); + if ( !prop || prop->len < sizeof(u32) ) + return dflt; + + return fdt32_to_cpu(*(uint32_t*)prop->data); +} + +/** + * device_tree_for_each_node - iterate over all device tree nodes + * @fdt: flat device tree. + * @func: function to call for each node. + * @data: data to pass to @func. + * + * Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. + * + * Returns 0 if all nodes were iterated over successfully. If @func + * returns a value different from 0, that value is returned immediately. + */ +static int __init device_tree_for_each_node(const void *fdt, + device_tree_node_func func, + void *data) +{ + int node; + int depth; + u32 address_cells[DEVICE_TREE_MAX_DEPTH]; + u32 size_cells[DEVICE_TREE_MAX_DEPTH]; + int ret; + + for ( node = 0, depth = 0; + node >=0 && depth >= 0; + node = fdt_next_node(fdt, node, &depth) ) + { + const char *name = fdt_get_name(fdt, node, NULL); + + if ( depth >= DEVICE_TREE_MAX_DEPTH ) + { + printk("Warning: device tree node `%s' is nested too deep\n", + name); + continue; + } + + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); + + + ret = func(fdt, node, name, depth, + address_cells[depth-1], size_cells[depth-1], data); + if ( ret != 0 ) + return ret; + } + return 0; +} + +static void __init process_memory_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + int i; + int banks; + const __be32 *cell; + paddr_t start, size; + u32 reg_cells = address_cells + size_cells; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: node `%s': invalid #address-cells or #size-cells", + name); + return; + } + + prop = fdt_get_property(fdt, node, "reg", NULL); + if ( !prop ) + { + printk("fdt: node `%s': missing `reg' property\n", name); + return; + } + + cell = (const __be32 *)prop->data; + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); + + for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) + { + device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( !size ) + continue; + bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; + bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; + bootinfo.mem.nr_banks++; + } +} + +static void __init process_multiboot_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const __be32 *cell; + int nr; + struct bootmodule *mod; + int len; + + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) + nr = MOD_KERNEL; + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) + nr = MOD_INITRD; + else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) + nr = MOD_XSM; + else + panic("%s not a known xen multiboot type\n", name); + + mod = &bootinfo.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "reg", &len); + if ( !prop ) + panic("node %s missing `reg' property\n", name); + + if ( len < dt_cells_to_size(address_cells + size_cells) ) + panic("fdt: node `%s': `reg` property length is too short\n", + name); + + cell = (const __be32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &mod->size); + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + + if ( nr > bootinfo.modules.nr_mods ) + bootinfo.modules.nr_mods = nr; +} + +static void __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; + paddr_t start, end; + int len; + + printk("Checking for initrd in /chosen\n"); + + prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); + if ( !prop ) + /* No initrd present. */ + return; + if ( len != sizeof(u32) && len != sizeof(u64) ) + { + printk("linux,initrd-start property has invalid length %d\n", len); + return; + } + start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); + + prop = fdt_get_property(fdt, node, "linux,initrd-end", &len); + if ( !prop ) + { + printk("linux,initrd-end not present but -start was\n"); + return; + } + if ( len != sizeof(u32) && len != sizeof(u64) ) + { + printk("linux,initrd-end property has invalid length %d\n", len); + return; + } + end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); + + if ( start >= end ) + { + printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", + start, end); + return; + } + + printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); + + mod->start = start; + mod->size = end - start; + + bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); +} + +static int __init early_scan_node(const void *fdt, + int node, const char *name, int depth, + u32 address_cells, u32 size_cells, + void *data) +{ + if ( device_tree_node_matches(fdt, node, "memory") ) + process_memory_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) + process_multiboot_node(fdt, node, name, address_cells, size_cells); + else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) + process_chosen_node(fdt, node, name, address_cells, size_cells); + + return 0; +} + +static void __init early_print_info(void) +{ + struct meminfo *mi = &bootinfo.mem; + struct bootmodules *mods = &bootinfo.modules; + int i, nr_rsvd; + + for ( i = 0; i < mi->nr_banks; i++ ) + printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", + mi->bank[i].start, + mi->bank[i].start + mi->bank[i].size - 1); + printk("\n"); + for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + i, + mods->module[i].start, + mods->module[i].start + mods->module[i].size, + mods->module[i].cmdline); + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + for ( i = 0; i < nr_rsvd; i++ ) + { + paddr_t s, e; + if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) + continue; + /* fdt_get_mem_rsv returns length */ + e += s; + printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", + i, s, e); + } + printk("\n"); +} + +/** + * boot_fdt_info - initialize bootinfo from a DTB + * @fdt: flattened device tree binary + * + * Returns the size of the DTB. + */ +size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) +{ + struct bootmodule *mod; + int ret; + + ret = fdt_check_header(fdt); + if ( ret < 0 ) + panic("No valid device tree\n"); + + mod = &bootinfo.modules.module[MOD_FDT]; + mod->start = paddr; + mod->size = fdt_totalsize(fdt); + + bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); + + device_tree_for_each_node((void *)fdt, early_scan_node, NULL); + early_print_info(); + + return fdt_totalsize(fdt); +} + +/* + * 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 b1aa9c3..05336d6 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -684,7 +684,7 @@ void __init start_xen(unsigned long boot_phys_offset, /* This is mapped by head.S */ device_tree_flattened = (void *)BOOT_FDT_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); - fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); + fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); cmdline = device_tree_bootargs(device_tree_flattened); printk("Command line: %s\n", cmdline); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index c0b2b95..689970d 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -22,7 +22,6 @@ #include #include #include -#include #include const void *device_tree_flattened; @@ -89,52 +88,6 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -static bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match) -{ - const char *name; - size_t match_len; - - name = fdt_get_name(fdt, node, NULL); - match_len = strlen(match); - - /* Match both "match" and "match@..." patterns but not - "match-foo". */ - return strncmp(name, match, match_len) == 0 - && (name[match_len] == '@' || name[match_len] == '\0'); -} - -static bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match) -{ - int len, l; - int mlen; - const void *prop; - - mlen = strlen(match); - - prop = fdt_getprop(fdt, node, "compatible", &len); - if ( prop == NULL ) - return 0; - - while ( len > 0 ) { - if ( !dt_compat_cmp(prop, match) ) - return 1; - l = strlen(prop) + 1; - prop += l; - len -= l; - } - - return 0; -} - -static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, - u32 size_cells, u64 *start, u64 *size) -{ - *start = dt_next_cell(address_cells, cell); - *size = dt_next_cell(size_cells, cell); -} - void dt_get_range(const __be32 **cell, const struct dt_device_node *np, u64 *address, u64 *size) { @@ -162,66 +115,6 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -static u32 __init device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt) -{ - const struct fdt_property *prop; - - prop = fdt_get_property(fdt, node, prop_name, NULL); - if ( !prop || prop->len < sizeof(u32) ) - return dflt; - - return fdt32_to_cpu(*(uint32_t*)prop->data); -} - -/** - * device_tree_for_each_node - iterate over all device tree nodes - * @fdt: flat device tree. - * @func: function to call for each node. - * @data: data to pass to @func. - * - * Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. - * - * Returns 0 if all nodes were iterated over successfully. If @func - * returns a value different from 0, that value is returned immediately. - */ -static int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, - void *data) -{ - int node; - int depth; - u32 address_cells[DEVICE_TREE_MAX_DEPTH]; - u32 size_cells[DEVICE_TREE_MAX_DEPTH]; - int ret; - - for ( node = 0, depth = 0; - node >=0 && depth >= 0; - node = fdt_next_node(fdt, node, &depth) ) - { - const char *name = fdt_get_name(fdt, node, NULL); - - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - { - printk("Warning: device tree node `%s' is nested too deep\n", - name); - continue; - } - - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", - depth > 0 ? address_cells[depth-1] : 0); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", - depth > 0 ? size_cells[depth-1] : 0); - - - ret = func(fdt, node, name, depth, - address_cells[depth-1], size_cells[depth-1], data); - if ( ret != 0 ) - return ret; - } - return 0; -} - /** * device_tree_bootargs - return the bootargs (the Xen command line) * @fdt flat device tree. @@ -253,257 +146,6 @@ const char *device_tree_bootargs(const void *fdt) return prop->data; } -static int dump_node(const void *fdt, int node, const char *name, int depth, - u32 address_cells, u32 size_cells, void *data) -{ - char prefix[2*DEVICE_TREE_MAX_DEPTH + 1] = ""; - int i; - int prop; - - for ( i = 0; i < depth; i++ ) - safe_strcat(prefix, " "); - - if ( name[0] == '\0' ) - name = "/"; - printk("%s%s:\n", prefix, name); - - for ( prop = fdt_first_property_offset(fdt, node); - prop >= 0; - prop = fdt_next_property_offset(fdt, prop) ) - { - const struct fdt_property *p; - - p = fdt_get_property_by_offset(fdt, prop, NULL); - - printk("%s %s\n", prefix, fdt_string(fdt, fdt32_to_cpu(p->nameoff))); - } - - return 0; -} - -/** - * device_tree_dump - print a text representation of a device tree - * @fdt: flat device tree to print - */ -void __init device_tree_dump(const void *fdt) -{ - device_tree_for_each_node(fdt, dump_node, NULL); -} - - -static void __init process_memory_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - int i; - int banks; - const __be32 *cell; - paddr_t start, size; - u32 reg_cells = address_cells + size_cells; - - if ( address_cells < 1 || size_cells < 1 ) - { - printk("fdt: node `%s': invalid #address-cells or #size-cells", - name); - return; - } - - prop = fdt_get_property(fdt, node, "reg", NULL); - if ( !prop ) - { - printk("fdt: node `%s': missing `reg' property\n", name); - return; - } - - cell = (const __be32 *)prop->data; - banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); - - for ( i = 0; i < banks && bootinfo.mem.nr_banks < NR_MEM_BANKS; i++ ) - { - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); - if ( !size ) - continue; - bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start; - bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size; - bootinfo.mem.nr_banks++; - } -} - -static void __init process_multiboot_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - const __be32 *cell; - int nr; - struct bootmodule *mod; - int len; - - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || - fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) - nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || - fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) - nr = MOD_INITRD; - else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) - nr = MOD_XSM; - else - panic("%s not a known xen multiboot type\n", name); - - mod = &bootinfo.modules.module[nr]; - - prop = fdt_get_property(fdt, node, "reg", &len); - if ( !prop ) - panic("node %s missing `reg' property\n", name); - - if ( len < dt_cells_to_size(address_cells + size_cells) ) - panic("fdt: node `%s': `reg` property length is too short\n", - name); - - cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &mod->start, &mod->size); - - prop = fdt_get_property(fdt, node, "bootargs", &len); - if ( prop ) - { - if ( len > sizeof(mod->cmdline) ) - panic("module %d command line too long\n", nr); - - safe_strcpy(mod->cmdline, prop->data); - } - else - mod->cmdline[0] = 0; - - if ( nr > bootinfo.modules.nr_mods ) - bootinfo.modules.nr_mods = nr; -} - -static void __init process_chosen_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; - paddr_t start, end; - int len; - - printk("Checking for initrd in /chosen\n"); - - prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); - if ( !prop ) - /* No initrd present. */ - return; - if ( len != sizeof(u32) && len != sizeof(u64) ) - { - printk("linux,initrd-start property has invalid length %d\n", len); - return; - } - start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); - - prop = fdt_get_property(fdt, node, "linux,initrd-end", &len); - if ( !prop ) - { - printk("linux,initrd-end not present but -start was\n"); - return; - } - if ( len != sizeof(u32) && len != sizeof(u64) ) - { - printk("linux,initrd-end property has invalid length %d\n", len); - return; - } - end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); - - if ( start >= end ) - { - printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", - start, end); - return; - } - - printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); - - mod->start = start; - mod->size = end - start; - - bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); -} - -static int __init early_scan_node(const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells, - void *data) -{ - if ( device_tree_node_matches(fdt, node, "memory") ) - process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || - device_tree_node_compatible(fdt, node, "multiboot,module" )) - process_multiboot_node(fdt, node, name, address_cells, size_cells); - else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) - process_chosen_node(fdt, node, name, address_cells, size_cells); - - return 0; -} - -static void __init early_print_info(void) -{ - struct meminfo *mi = &bootinfo.mem; - struct bootmodules *mods = &bootinfo.modules; - int i, nr_rsvd; - - for ( i = 0; i < mi->nr_banks; i++ ) - printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", - mi->bank[i].start, - mi->bank[i].start + mi->bank[i].size - 1); - printk("\n"); - for ( i = 1 ; i < mods->nr_mods + 1; i++ ) - printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", - i, - mods->module[i].start, - mods->module[i].start + mods->module[i].size, - mods->module[i].cmdline); - nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); - for ( i = 0; i < nr_rsvd; i++ ) - { - paddr_t s, e; - if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) - continue; - /* fdt_get_mem_rsv returns length */ - e += s; - printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", - i, s, e); - } - printk("\n"); -} - -/** - * device_tree_early_init - initialize early info from a DTB - * @fdt: flattened device tree binary - * - * Returns the size of the DTB. - */ -size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) -{ - struct bootmodule *mod; - int ret; - - ret = fdt_check_header(fdt); - if ( ret < 0 ) - panic("No valid device tree\n"); - - mod = &bootinfo.modules.module[MOD_FDT]; - mod->start = paddr; - mod->size = fdt_totalsize(fdt); - - bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); - - device_tree_for_each_node((void *)fdt, early_scan_node, NULL); - early_print_info(); - - return fdt_totalsize(fdt); -} - static void __init *unflatten_dt_alloc(unsigned long *mem, unsigned long size, unsigned long align) { diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index ea0dc46..21dbcd4 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -53,6 +53,8 @@ int construct_dom0(struct domain *d); void discard_initial_modules(void); +size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); + #endif /* * Local variables: diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 717ef55..7e6ab6b 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -159,10 +159,7 @@ typedef int (*device_tree_node_func)(const void *fdt, extern const void *device_tree_flattened; -size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); - const char __init *device_tree_bootargs(const void *fdt); -void __init device_tree_dump(const void *fdt); /** * dt_unflatten_host_device_tree - Unflatten the host device tree -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKV-0007ZU-Ns; Tue, 22 Jul 2014 03:01:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKU-0007ZF-JK for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:26 +0000 Received: from [85.158.137.68:28164] by server-8.bemta-3.messagelabs.com id 06/DC-31195-504DDC35; Tue, 22 Jul 2014 03:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405998082!17213055!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13274 invoked from network); 22 Jul 2014 03:01:23 -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; 22 Jul 2014 03:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKQ-0003l4-2j for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKP-0002Ss-So for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:22 +0000 Date: Tue, 22 Jul 2014 03:01:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35d41dd8425a4740847eae3ce81063c796042fd0 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:16 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: move device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 27 +++++++++++++++++++++++++++ xen/arch/arm/setup.c | 2 +- xen/common/device_tree.c | 31 ------------------------------- xen/include/asm-arm/setup.h | 1 + xen/include/xen/device_tree.h | 2 -- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index bcf4882..23aff5a 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -335,6 +335,33 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) return fdt_totalsize(fdt); } +const char *boot_fdt_cmdline(const void *fdt) +{ + int node; + const struct fdt_property *prop; + + node = fdt_path_offset(fdt, "/chosen"); + if ( node < 0 ) + return NULL; + + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); + if ( prop == NULL ) + { + struct bootmodule *dom0_mod = NULL; + + if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) + dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; + + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || + ( dom0_mod && dom0_mod->cmdline[0] ) ) + prop = fdt_get_property(fdt, node, "bootargs", NULL); + } + if ( prop == NULL ) + return NULL; + + return prop->data; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 05336d6..eefb610 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -686,7 +686,7 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); - cmdline = device_tree_bootargs(device_tree_flattened); + cmdline = boot_fdt_cmdline(device_tree_flattened); printk("Command line: %s\n", cmdline); cmdline_parse(cmdline); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 689970d..f72b2e9 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -115,37 +115,6 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -/** - * device_tree_bootargs - return the bootargs (the Xen command line) - * @fdt flat device tree. - */ -const char *device_tree_bootargs(const void *fdt) -{ - int node; - const struct fdt_property *prop; - - node = fdt_path_offset(fdt, "/chosen"); - if ( node < 0 ) - return NULL; - - prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); - if ( prop == NULL ) - { - struct bootmodule *dom0_mod = NULL; - - if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; - - if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || - ( dom0_mod && dom0_mod->cmdline[0] ) ) - prop = fdt_get_property(fdt, node, "bootargs", NULL); - } - if ( prop == NULL ) - return NULL; - - return prop->data; -} - static void __init *unflatten_dt_alloc(unsigned long *mem, unsigned long size, unsigned long align) { diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 21dbcd4..85aa866 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -54,6 +54,7 @@ int construct_dom0(struct domain *d); void discard_initial_modules(void); size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); +const char __init *boot_fdt_cmdline(const void *fdt); #endif /* diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 7e6ab6b..08db8bc 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -159,8 +159,6 @@ typedef int (*device_tree_node_func)(const void *fdt, extern const void *device_tree_flattened; -const char __init *device_tree_bootargs(const void *fdt); - /** * dt_unflatten_host_device_tree - Unflatten the host device tree * -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKV-0007ZU-Ns; Tue, 22 Jul 2014 03:01:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKU-0007ZF-JK for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:26 +0000 Received: from [85.158.137.68:28164] by server-8.bemta-3.messagelabs.com id 06/DC-31195-504DDC35; Tue, 22 Jul 2014 03:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1405998082!17213055!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13274 invoked from network); 22 Jul 2014 03:01:23 -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; 22 Jul 2014 03:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKQ-0003l4-2j for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKP-0002Ss-So for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:22 +0000 Date: Tue, 22 Jul 2014 03:01:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35d41dd8425a4740847eae3ce81063c796042fd0 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:16 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:16:59 2014 +0100 xen: arm: move device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 27 +++++++++++++++++++++++++++ xen/arch/arm/setup.c | 2 +- xen/common/device_tree.c | 31 ------------------------------- xen/include/asm-arm/setup.h | 1 + xen/include/xen/device_tree.h | 2 -- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index bcf4882..23aff5a 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -335,6 +335,33 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) return fdt_totalsize(fdt); } +const char *boot_fdt_cmdline(const void *fdt) +{ + int node; + const struct fdt_property *prop; + + node = fdt_path_offset(fdt, "/chosen"); + if ( node < 0 ) + return NULL; + + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); + if ( prop == NULL ) + { + struct bootmodule *dom0_mod = NULL; + + if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) + dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; + + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || + ( dom0_mod && dom0_mod->cmdline[0] ) ) + prop = fdt_get_property(fdt, node, "bootargs", NULL); + } + if ( prop == NULL ) + return NULL; + + return prop->data; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 05336d6..eefb610 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -686,7 +686,7 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); - cmdline = device_tree_bootargs(device_tree_flattened); + cmdline = boot_fdt_cmdline(device_tree_flattened); printk("Command line: %s\n", cmdline); cmdline_parse(cmdline); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 689970d..f72b2e9 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -115,37 +115,6 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -/** - * device_tree_bootargs - return the bootargs (the Xen command line) - * @fdt flat device tree. - */ -const char *device_tree_bootargs(const void *fdt) -{ - int node; - const struct fdt_property *prop; - - node = fdt_path_offset(fdt, "/chosen"); - if ( node < 0 ) - return NULL; - - prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); - if ( prop == NULL ) - { - struct bootmodule *dom0_mod = NULL; - - if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; - - if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || - ( dom0_mod && dom0_mod->cmdline[0] ) ) - prop = fdt_get_property(fdt, node, "bootargs", NULL); - } - if ( prop == NULL ) - return NULL; - - return prop->data; -} - static void __init *unflatten_dt_alloc(unsigned long *mem, unsigned long size, unsigned long align) { diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 21dbcd4..85aa866 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -54,6 +54,7 @@ int construct_dom0(struct domain *d); void discard_initial_modules(void); size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); +const char __init *boot_fdt_cmdline(const void *fdt); #endif /* diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 7e6ab6b..08db8bc 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -159,8 +159,6 @@ typedef int (*device_tree_node_func)(const void *fdt, extern const void *device_tree_flattened; -const char __init *device_tree_bootargs(const void *fdt); - /** * dt_unflatten_host_device_tree - Unflatten the host device tree * -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKe-0007bC-TT; Tue, 22 Jul 2014 03:01:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKd-0007ar-DQ for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:35 +0000 Received: from [85.158.143.35:62795] by server-2.bemta-4.messagelabs.com id 40/67-26128-E04DDC35; Tue, 22 Jul 2014 03:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1405998092!19226587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20262 invoked from network); 22 Jul 2014 03:01:33 -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 Jul 2014 03:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKa-0003lC-9h for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKa-0002TG-6u for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:32 +0000 Date: Tue, 22 Jul 2014 03:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: store per-boot module type instead of relying on index X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e73b7d6619c8fb729a339a28b1c83ce650c96225 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:17 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:17:44 2014 +0100 xen: arm: store per-boot module type instead of relying on index This is more natural and better matches how multiboot is actually supposed to work. As part of this we need to modify consider_modules to handle Xen not necessarily being module zero any more. To do this we first register a module for Xen at the original load address and then update after we have relocated. This is also fixing a latent issue which is that get_xen_paddr() would not consider Xen's current physical address when picking the target address which was buggy because the relocation code cannot handle the possibility of the old and new locations overlapping. All callers of consider_modules now consider the full range instead of some skipping slot 0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 49 +++++++++++-------------------- xen/arch/arm/domain_build.c | 20 ++++++++---- xen/arch/arm/kernel.c | 15 +++++---- xen/arch/arm/setup.c | 68 ++++++++++++++++++++++++++++++++++++++---- xen/include/asm-arm/setup.h | 29 ++++++++++++------ xen/xsm/xsm_policy.c | 19 ++++++++++-- 6 files changed, 134 insertions(+), 66 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 23aff5a..ce7fdf2 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -167,23 +167,22 @@ static void __init process_multiboot_node(const void *fdt, int node, { const struct fdt_property *prop; const __be32 *cell; - int nr; - struct bootmodule *mod; + bootmodule_kind kind; + paddr_t start, size; + const char *cmdline; int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) - nr = MOD_KERNEL; + kind = BOOTMOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) - nr = MOD_INITRD; + kind = BOOTMOD_RAMDISK; else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) - nr = MOD_XSM; + kind = BOOTMOD_XSM; else panic("%s not a known xen multiboot type\n", name); - mod = &bootinfo.modules.module[nr]; - prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) panic("node %s missing `reg' property\n", name); @@ -193,22 +192,19 @@ static void __init process_multiboot_node(const void *fdt, int node, name); cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &mod->start, &mod->size); + device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); prop = fdt_get_property(fdt, node, "bootargs", &len); if ( prop ) { - if ( len > sizeof(mod->cmdline) ) - panic("module %d command line too long\n", nr); - - safe_strcpy(mod->cmdline, prop->data); + if ( len > BOOTMOD_MAX_CMDLINE ) + panic("module %s command line too long\n", name); + cmdline = prop->data; } else - mod->cmdline[0] = 0; + cmdline = NULL; - if ( nr > bootinfo.modules.nr_mods ) - bootinfo.modules.nr_mods = nr; + add_boot_module(kind, start, size, cmdline); } static void __init process_chosen_node(const void *fdt, int node, @@ -216,7 +212,6 @@ static void __init process_chosen_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; paddr_t start, end; int len; @@ -255,10 +250,7 @@ static void __init process_chosen_node(const void *fdt, int node, printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); - mod->start = start; - mod->size = end - start; - - bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); + add_boot_module(BOOTMOD_RAMDISK, start, end-start, NULL); } static int __init early_scan_node(const void *fdt, @@ -288,7 +280,7 @@ static void __init early_print_info(void) mi->bank[i].start, mi->bank[i].start + mi->bank[i].size - 1); printk("\n"); - for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + for ( i = 0 ; i < mods->nr_mods; i++ ) printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", i, mods->module[i].start, @@ -316,18 +308,13 @@ static void __init early_print_info(void) */ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) { - struct bootmodule *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) panic("No valid device tree\n"); - mod = &bootinfo.modules.module[MOD_FDT]; - mod->start = paddr; - mod->size = fdt_totalsize(fdt); - - bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); + add_boot_module(BOOTMOD_FDT, paddr, fdt_totalsize(fdt), NULL); device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); @@ -347,10 +334,8 @@ const char *boot_fdt_cmdline(const void *fdt) prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); if ( prop == NULL ) { - struct bootmodule *dom0_mod = NULL; - - if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; + struct bootmodule *dom0_mod = + boot_module_find_by_kind(BOOTMOD_KERNEL); if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || ( dom0_mod && dom0_mod->cmdline[0] ) ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a065442..154367e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -405,9 +405,10 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - if ( bootinfo.modules.nr_mods >= MOD_KERNEL && - bootinfo.modules.module[MOD_KERNEL].cmdline[0] ) - bootargs = &bootinfo.modules.module[MOD_KERNEL].cmdline[0]; + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + + if ( mod && mod->cmdline[0] ) + bootargs = &mod->cmdline[0]; dt_for_each_property_node (node, prop) { @@ -454,6 +455,8 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + if ( bootargs ) { res = fdt_property(kinfo->fdt, "bootargs", bootargs, @@ -466,7 +469,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * If the bootloader provides an initrd, we must create a placeholder * for the initrd properties. The values will be replaced later. */ - if ( bootinfo.modules.module[MOD_INITRD].size ) + if ( mod && mod->size ) { u64 a = 0; res = fdt_property(kinfo->fdt, "linux,initrd-start", &a, sizeof(a)); @@ -1221,18 +1224,21 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr = bootinfo.modules.module[MOD_INITRD].start; - paddr_t len = bootinfo.modules.module[MOD_INITRD].size; + paddr_t paddr, len; unsigned long offs; int node; int res; __be32 val[2]; __be32 *cellp; - if ( !len ) + if ( !mod || !mod->size ) return; + paddr = mod->start; + len = mod->size; + printk("Loading dom0 initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, load_addr, load_addr + len); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index ce5b95a..230ff8f 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,8 +68,8 @@ static void place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const paddr_t initrd_len = - ROUNDUP(bootinfo.modules.module[MOD_INITRD].size, MB(2)); + const struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -372,20 +372,21 @@ err: int kernel_probe(struct kernel_info *info) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); int rc; paddr_t start, size; - start = bootinfo.modules.module[MOD_KERNEL].start; - size = bootinfo.modules.module[MOD_KERNEL].size; - - if ( !size ) + if ( !mod || !mod->size ) { printk(XENLOG_ERR "Missing kernel boot module?\n"); return -ENOENT; } - printk("Loading kernel from boot module %d\n", MOD_KERNEL); + start = mod->start; + size = mod->size; + + printk("Loading kernel from boot module @ %"PRIpaddr"\n", start); #ifdef CONFIG_ARM_64 rc = kernel_zimage64_probe(info, start, size); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index eefb610..0cbe552 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -183,17 +183,58 @@ static void dt_unreserved_regions(paddr_t s, paddr_t e, cb(s, e); } +struct bootmodule *add_boot_module(bootmodule_kind kind, + paddr_t start, paddr_t size, + const char *cmdline) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + + if ( mods->nr_mods == MAX_MODULES ) + { + printk("Ignoring %s boot module at %"PRIpaddr"-%"PRIpaddr" (too many)\n", + boot_module_kind_as_string(kind), start, start + size); + return NULL; + } + + mod = &mods->module[mods->nr_mods++]; + mod->kind = kind; + mod->start = start; + mod->size = size; + if ( cmdline ) + safe_strcpy(mod->cmdline, cmdline); + else + mod->cmdline[0] = 0; + + return mod; +} + +struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + int i; + for (i = 0 ; i < mods->nr_mods ; i++ ) + { + mod = &mods->module[i]; + if ( mod->kind == kind ) + return mod; + } + return NULL; +} + void __init discard_initial_modules(void) { struct bootmodules *mi = &bootinfo.modules; int i; - for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) + for ( i = 0; i <= mi->nr_mods; i++ ) { paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - dt_unreserved_regions(s, e, init_domheap_pages, 0); + if ( mi->module[i].kind != BOOTMOD_XEN ) + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 0; @@ -335,7 +376,7 @@ static paddr_t __init get_xen_paddr(void) if ( bank->size >= min_size ) { e = consider_modules(bank->start, bank->start + bank->size, - min_size, XEN_PADDR_ALIGN, 1); + min_size, XEN_PADDR_ALIGN, 0); if ( !e ) continue; @@ -360,9 +401,6 @@ static paddr_t __init get_xen_paddr(void) printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - bootinfo.modules.module[MOD_XEN].start = paddr; - bootinfo.modules.module[MOD_XEN].size = min_size; - return paddr; } @@ -665,7 +703,9 @@ void __init start_xen(unsigned long boot_phys_offset, { size_t fdt_size; int cpus, i; + paddr_t xen_paddr; const char *cmdline; + struct bootmodule *xen_bootmodule; struct domain *dom0; setup_cache(); @@ -690,7 +730,21 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Command line: %s\n", cmdline); cmdline_parse(cmdline); - setup_pagetables(boot_phys_offset, get_xen_paddr()); + /* Register Xen's load address as a boot module. */ + xen_bootmodule = add_boot_module(BOOTMOD_XEN, + (paddr_t)(uintptr_t)(_start + boot_phys_offset), + (paddr_t)(uintptr_t)(_end - _start + 1), NULL); + BUG_ON(!xen_bootmodule); + + xen_paddr = get_xen_paddr(); + setup_pagetables(boot_phys_offset, xen_paddr); + + /* Update Xen's address now that we have relocated. */ + printk("Update BOOTMOD_XEN from %"PRIpaddr"-%"PRIpaddr" => %"PRIpaddr"-%"PRIpaddr"\n", + xen_bootmodule->start, xen_bootmodule->start + xen_bootmodule->size, + xen_paddr, xen_paddr + xen_bootmodule->size); + xen_bootmodule->start = xen_paddr; + setup_mm(fdt_paddr, fdt_size); vm_init(); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 85aa866..e2e18c3 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -5,14 +5,17 @@ #define NR_MEM_BANKS 8 -#define MOD_XEN 0 -#define MOD_FDT 1 -#define MOD_KERNEL 2 -#define MOD_INITRD 3 -#define MOD_XSM 4 -#define NR_MODULES 5 +#define MAX_MODULES 5 /* Current maximum useful modules */ + +typedef enum { + BOOTMOD_XEN, + BOOTMOD_FDT, + BOOTMOD_KERNEL, + BOOTMOD_RAMDISK, + BOOTMOD_XSM, + BOOTMOD_UNKNOWN +} bootmodule_kind; -#define MOD_DISCARD_FIRST MOD_FDT struct membank { paddr_t start; @@ -24,16 +27,17 @@ struct meminfo { struct membank bank[NR_MEM_BANKS]; }; +#define BOOTMOD_MAX_CMDLINE 1024 struct bootmodule { + bootmodule_kind kind; paddr_t start; paddr_t size; - char cmdline[1024]; + char cmdline[BOOTMOD_MAX_CMDLINE]; }; struct bootmodules { int nr_mods; - /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct bootmodule module[NR_MODULES]; + struct bootmodule module[MAX_MODULES]; }; struct bootinfo { @@ -56,6 +60,11 @@ void discard_initial_modules(void); size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); const char __init *boot_fdt_cmdline(const void *fdt); +struct bootmodule *add_boot_module(bootmodule_kind kind, + paddr_t start, paddr_t size, + const char *cmdline); +struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); + #endif /* * Local variables: diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index a0dee09..6e0bb78 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -77,13 +77,16 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, #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; + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); + paddr_t paddr, len; xsm_magic_t magic; - if ( !len ) + if ( !mod || !mod->size ) return 0; + paddr = mod->start; + len = mod->size; + copy_from_paddr(&magic, paddr, sizeof(magic)); if ( magic != XSM_MAGIC ) @@ -106,3 +109,13 @@ int __init xsm_dt_policy_init(void) return 0; } #endif + +/* + * 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 Tue Jul 22 03:01:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKe-0007bC-TT; Tue, 22 Jul 2014 03:01:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKd-0007ar-DQ for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:35 +0000 Received: from [85.158.143.35:62795] by server-2.bemta-4.messagelabs.com id 40/67-26128-E04DDC35; Tue, 22 Jul 2014 03:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1405998092!19226587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20262 invoked from network); 22 Jul 2014 03:01:33 -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 Jul 2014 03:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKa-0003lC-9h for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKa-0002TG-6u for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:32 +0000 Date: Tue, 22 Jul 2014 03:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: store per-boot module type instead of relying on index X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e73b7d6619c8fb729a339a28b1c83ce650c96225 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:17 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:17:44 2014 +0100 xen: arm: store per-boot module type instead of relying on index This is more natural and better matches how multiboot is actually supposed to work. As part of this we need to modify consider_modules to handle Xen not necessarily being module zero any more. To do this we first register a module for Xen at the original load address and then update after we have relocated. This is also fixing a latent issue which is that get_xen_paddr() would not consider Xen's current physical address when picking the target address which was buggy because the relocation code cannot handle the possibility of the old and new locations overlapping. All callers of consider_modules now consider the full range instead of some skipping slot 0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 49 +++++++++++-------------------- xen/arch/arm/domain_build.c | 20 ++++++++---- xen/arch/arm/kernel.c | 15 +++++---- xen/arch/arm/setup.c | 68 ++++++++++++++++++++++++++++++++++++++---- xen/include/asm-arm/setup.h | 29 ++++++++++++------ xen/xsm/xsm_policy.c | 19 ++++++++++-- 6 files changed, 134 insertions(+), 66 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 23aff5a..ce7fdf2 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -167,23 +167,22 @@ static void __init process_multiboot_node(const void *fdt, int node, { const struct fdt_property *prop; const __be32 *cell; - int nr; - struct bootmodule *mod; + bootmodule_kind kind; + paddr_t start, size; + const char *cmdline; int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) - nr = MOD_KERNEL; + kind = BOOTMOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) - nr = MOD_INITRD; + kind = BOOTMOD_RAMDISK; else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) - nr = MOD_XSM; + kind = BOOTMOD_XSM; else panic("%s not a known xen multiboot type\n", name); - mod = &bootinfo.modules.module[nr]; - prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) panic("node %s missing `reg' property\n", name); @@ -193,22 +192,19 @@ static void __init process_multiboot_node(const void *fdt, int node, name); cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &mod->start, &mod->size); + device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); prop = fdt_get_property(fdt, node, "bootargs", &len); if ( prop ) { - if ( len > sizeof(mod->cmdline) ) - panic("module %d command line too long\n", nr); - - safe_strcpy(mod->cmdline, prop->data); + if ( len > BOOTMOD_MAX_CMDLINE ) + panic("module %s command line too long\n", name); + cmdline = prop->data; } else - mod->cmdline[0] = 0; + cmdline = NULL; - if ( nr > bootinfo.modules.nr_mods ) - bootinfo.modules.nr_mods = nr; + add_boot_module(kind, start, size, cmdline); } static void __init process_chosen_node(const void *fdt, int node, @@ -216,7 +212,6 @@ static void __init process_chosen_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - struct bootmodule *mod = &bootinfo.modules.module[MOD_INITRD]; paddr_t start, end; int len; @@ -255,10 +250,7 @@ static void __init process_chosen_node(const void *fdt, int node, printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); - mod->start = start; - mod->size = end - start; - - bootinfo.modules.nr_mods = max(MOD_INITRD, bootinfo.modules.nr_mods); + add_boot_module(BOOTMOD_RAMDISK, start, end-start, NULL); } static int __init early_scan_node(const void *fdt, @@ -288,7 +280,7 @@ static void __init early_print_info(void) mi->bank[i].start, mi->bank[i].start + mi->bank[i].size - 1); printk("\n"); - for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + for ( i = 0 ; i < mods->nr_mods; i++ ) printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", i, mods->module[i].start, @@ -316,18 +308,13 @@ static void __init early_print_info(void) */ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) { - struct bootmodule *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) panic("No valid device tree\n"); - mod = &bootinfo.modules.module[MOD_FDT]; - mod->start = paddr; - mod->size = fdt_totalsize(fdt); - - bootinfo.modules.nr_mods = max(MOD_FDT, bootinfo.modules.nr_mods); + add_boot_module(BOOTMOD_FDT, paddr, fdt_totalsize(fdt), NULL); device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); @@ -347,10 +334,8 @@ const char *boot_fdt_cmdline(const void *fdt) prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); if ( prop == NULL ) { - struct bootmodule *dom0_mod = NULL; - - if ( bootinfo.modules.nr_mods >= MOD_KERNEL ) - dom0_mod = &bootinfo.modules.module[MOD_KERNEL]; + struct bootmodule *dom0_mod = + boot_module_find_by_kind(BOOTMOD_KERNEL); if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL) || ( dom0_mod && dom0_mod->cmdline[0] ) ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a065442..154367e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -405,9 +405,10 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - if ( bootinfo.modules.nr_mods >= MOD_KERNEL && - bootinfo.modules.module[MOD_KERNEL].cmdline[0] ) - bootargs = &bootinfo.modules.module[MOD_KERNEL].cmdline[0]; + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + + if ( mod && mod->cmdline[0] ) + bootargs = &mod->cmdline[0]; dt_for_each_property_node (node, prop) { @@ -454,6 +455,8 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + if ( bootargs ) { res = fdt_property(kinfo->fdt, "bootargs", bootargs, @@ -466,7 +469,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * If the bootloader provides an initrd, we must create a placeholder * for the initrd properties. The values will be replaced later. */ - if ( bootinfo.modules.module[MOD_INITRD].size ) + if ( mod && mod->size ) { u64 a = 0; res = fdt_property(kinfo->fdt, "linux,initrd-start", &a, sizeof(a)); @@ -1221,18 +1224,21 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr = bootinfo.modules.module[MOD_INITRD].start; - paddr_t len = bootinfo.modules.module[MOD_INITRD].size; + paddr_t paddr, len; unsigned long offs; int node; int res; __be32 val[2]; __be32 *cellp; - if ( !len ) + if ( !mod || !mod->size ) return; + paddr = mod->start; + len = mod->size; + printk("Loading dom0 initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, load_addr, load_addr + len); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index ce5b95a..230ff8f 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,8 +68,8 @@ static void place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const paddr_t initrd_len = - ROUNDUP(bootinfo.modules.module[MOD_INITRD].size, MB(2)); + const struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -372,20 +372,21 @@ err: int kernel_probe(struct kernel_info *info) { + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); int rc; paddr_t start, size; - start = bootinfo.modules.module[MOD_KERNEL].start; - size = bootinfo.modules.module[MOD_KERNEL].size; - - if ( !size ) + if ( !mod || !mod->size ) { printk(XENLOG_ERR "Missing kernel boot module?\n"); return -ENOENT; } - printk("Loading kernel from boot module %d\n", MOD_KERNEL); + start = mod->start; + size = mod->size; + + printk("Loading kernel from boot module @ %"PRIpaddr"\n", start); #ifdef CONFIG_ARM_64 rc = kernel_zimage64_probe(info, start, size); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index eefb610..0cbe552 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -183,17 +183,58 @@ static void dt_unreserved_regions(paddr_t s, paddr_t e, cb(s, e); } +struct bootmodule *add_boot_module(bootmodule_kind kind, + paddr_t start, paddr_t size, + const char *cmdline) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + + if ( mods->nr_mods == MAX_MODULES ) + { + printk("Ignoring %s boot module at %"PRIpaddr"-%"PRIpaddr" (too many)\n", + boot_module_kind_as_string(kind), start, start + size); + return NULL; + } + + mod = &mods->module[mods->nr_mods++]; + mod->kind = kind; + mod->start = start; + mod->size = size; + if ( cmdline ) + safe_strcpy(mod->cmdline, cmdline); + else + mod->cmdline[0] = 0; + + return mod; +} + +struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + int i; + for (i = 0 ; i < mods->nr_mods ; i++ ) + { + mod = &mods->module[i]; + if ( mod->kind == kind ) + return mod; + } + return NULL; +} + void __init discard_initial_modules(void) { struct bootmodules *mi = &bootinfo.modules; int i; - for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) + for ( i = 0; i <= mi->nr_mods; i++ ) { paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - dt_unreserved_regions(s, e, init_domheap_pages, 0); + if ( mi->module[i].kind != BOOTMOD_XEN ) + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 0; @@ -335,7 +376,7 @@ static paddr_t __init get_xen_paddr(void) if ( bank->size >= min_size ) { e = consider_modules(bank->start, bank->start + bank->size, - min_size, XEN_PADDR_ALIGN, 1); + min_size, XEN_PADDR_ALIGN, 0); if ( !e ) continue; @@ -360,9 +401,6 @@ static paddr_t __init get_xen_paddr(void) printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - bootinfo.modules.module[MOD_XEN].start = paddr; - bootinfo.modules.module[MOD_XEN].size = min_size; - return paddr; } @@ -665,7 +703,9 @@ void __init start_xen(unsigned long boot_phys_offset, { size_t fdt_size; int cpus, i; + paddr_t xen_paddr; const char *cmdline; + struct bootmodule *xen_bootmodule; struct domain *dom0; setup_cache(); @@ -690,7 +730,21 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Command line: %s\n", cmdline); cmdline_parse(cmdline); - setup_pagetables(boot_phys_offset, get_xen_paddr()); + /* Register Xen's load address as a boot module. */ + xen_bootmodule = add_boot_module(BOOTMOD_XEN, + (paddr_t)(uintptr_t)(_start + boot_phys_offset), + (paddr_t)(uintptr_t)(_end - _start + 1), NULL); + BUG_ON(!xen_bootmodule); + + xen_paddr = get_xen_paddr(); + setup_pagetables(boot_phys_offset, xen_paddr); + + /* Update Xen's address now that we have relocated. */ + printk("Update BOOTMOD_XEN from %"PRIpaddr"-%"PRIpaddr" => %"PRIpaddr"-%"PRIpaddr"\n", + xen_bootmodule->start, xen_bootmodule->start + xen_bootmodule->size, + xen_paddr, xen_paddr + xen_bootmodule->size); + xen_bootmodule->start = xen_paddr; + setup_mm(fdt_paddr, fdt_size); vm_init(); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 85aa866..e2e18c3 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -5,14 +5,17 @@ #define NR_MEM_BANKS 8 -#define MOD_XEN 0 -#define MOD_FDT 1 -#define MOD_KERNEL 2 -#define MOD_INITRD 3 -#define MOD_XSM 4 -#define NR_MODULES 5 +#define MAX_MODULES 5 /* Current maximum useful modules */ + +typedef enum { + BOOTMOD_XEN, + BOOTMOD_FDT, + BOOTMOD_KERNEL, + BOOTMOD_RAMDISK, + BOOTMOD_XSM, + BOOTMOD_UNKNOWN +} bootmodule_kind; -#define MOD_DISCARD_FIRST MOD_FDT struct membank { paddr_t start; @@ -24,16 +27,17 @@ struct meminfo { struct membank bank[NR_MEM_BANKS]; }; +#define BOOTMOD_MAX_CMDLINE 1024 struct bootmodule { + bootmodule_kind kind; paddr_t start; paddr_t size; - char cmdline[1024]; + char cmdline[BOOTMOD_MAX_CMDLINE]; }; struct bootmodules { int nr_mods; - /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct bootmodule module[NR_MODULES]; + struct bootmodule module[MAX_MODULES]; }; struct bootinfo { @@ -56,6 +60,11 @@ void discard_initial_modules(void); size_t __init boot_fdt_info(const void *fdt, paddr_t paddr); const char __init *boot_fdt_cmdline(const void *fdt); +struct bootmodule *add_boot_module(bootmodule_kind kind, + paddr_t start, paddr_t size, + const char *cmdline); +struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); + #endif /* * Local variables: diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index a0dee09..6e0bb78 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -77,13 +77,16 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, #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; + struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); + paddr_t paddr, len; xsm_magic_t magic; - if ( !len ) + if ( !mod || !mod->size ) return 0; + paddr = mod->start; + len = mod->size; + copy_from_paddr(&magic, paddr, sizeof(magic)); if ( magic != XSM_MAGIC ) @@ -106,3 +109,13 @@ int __init xsm_dt_policy_init(void) return 0; } #endif + +/* + * 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 Tue Jul 22 03:01:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKp-0007co-07; Tue, 22 Jul 2014 03:01:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKm-0007cT-TS for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:45 +0000 Received: from [193.109.254.147:63230] by server-11.bemta-14.messagelabs.com id BA/F9-14213-814DDC35; Tue, 22 Jul 2014 03:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405998102!18789800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31319 invoked from network); 22 Jul 2014 03:01:43 -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; 22 Jul 2014 03:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKk-0003lJ-G6 for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKk-0002Tk-EH for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:42 +0000 Date: Tue, 22 Jul 2014 03:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support bootmodule type detection by ordering X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e55370e3a0da5192fe3c29a370f26e1663707042 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:18 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:17:56 2014 +0100 xen: arm: support bootmodule type detection by ordering Assign modules types based on the order in which they are defined in the FDT. This is supported only for the dom0 kernel and ramdisk when given as the first and second modules respectively, similar to how http://wiki.xen.org/wiki?title=Xen_ARM_with_Virtualization_Extensions/Multiboot&oldid=11824 defined the default types from the bootloader side. This is compatible with how Xen interprets the modules with x86 multiboot and I think simplifies things for bootloaders which now need not contain similar guessing code if they only care about the most basic case. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 17 +++++++++++++++-- xen/arch/arm/setup.c | 14 ++++++++++++++ xen/include/asm-arm/setup.h | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ce7fdf2..e100233 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -165,6 +165,7 @@ static void __init process_multiboot_node(const void *fdt, int node, const char *name, u32 address_cells, u32 size_cells) { + static int kind_guess = 0; const struct fdt_property *prop; const __be32 *cell; bootmodule_kind kind; @@ -181,7 +182,18 @@ static void __init process_multiboot_node(const void *fdt, int node, else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) kind = BOOTMOD_XSM; else - panic("%s not a known xen multiboot type\n", name); + kind = BOOTMOD_UNKNOWN; + + /* Guess that first two unknown are kernel and ramdisk respectively. */ + if ( kind == BOOTMOD_UNKNOWN ) + { + switch ( kind_guess++ ) + { + case 0: kind = BOOTMOD_KERNEL; break; + case 1: kind = BOOTMOD_RAMDISK; break; + default: break; + } + } prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) @@ -281,10 +293,11 @@ static void __init early_print_info(void) mi->bank[i].start + mi->bank[i].size - 1); printk("\n"); for ( i = 0 ; i < mods->nr_mods; i++ ) - printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %-12s %s\n", i, mods->module[i].start, mods->module[i].start + mods->module[i].size, + boot_module_kind_as_string(mods->module[i].kind), mods->module[i].cmdline); nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); for ( i = 0; i < nr_rsvd; i++ ) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 0cbe552..e53e491 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -223,6 +223,20 @@ struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) return NULL; } +const char * __init boot_module_kind_as_string(bootmodule_kind kind) +{ + switch ( kind ) + { + case BOOTMOD_XEN: return "Xen"; + case BOOTMOD_FDT: return "Device Tree"; + case BOOTMOD_KERNEL: return "Kernel"; + case BOOTMOD_RAMDISK: return "Ramdisk"; + case BOOTMOD_XSM: return "XSM"; + case BOOTMOD_UNKNOWN: return "Unknown"; + default: BUG(); + } +} + void __init discard_initial_modules(void) { struct bootmodules *mi = &bootinfo.modules; diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index e2e18c3..36e5704 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -64,6 +64,7 @@ struct bootmodule *add_boot_module(bootmodule_kind kind, paddr_t start, paddr_t size, const char *cmdline); struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); +const char * __init boot_module_kind_as_string(bootmodule_kind kind); #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 Tue Jul 22 03:01:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKp-0007co-07; Tue, 22 Jul 2014 03:01:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKm-0007cT-TS for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:45 +0000 Received: from [193.109.254.147:63230] by server-11.bemta-14.messagelabs.com id BA/F9-14213-814DDC35; Tue, 22 Jul 2014 03:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1405998102!18789800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31319 invoked from network); 22 Jul 2014 03:01:43 -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; 22 Jul 2014 03:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKk-0003lJ-G6 for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKk-0002Tk-EH for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:42 +0000 Date: Tue, 22 Jul 2014 03:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support bootmodule type detection by ordering X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e55370e3a0da5192fe3c29a370f26e1663707042 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:18 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:17:56 2014 +0100 xen: arm: support bootmodule type detection by ordering Assign modules types based on the order in which they are defined in the FDT. This is supported only for the dom0 kernel and ramdisk when given as the first and second modules respectively, similar to how http://wiki.xen.org/wiki?title=Xen_ARM_with_Virtualization_Extensions/Multiboot&oldid=11824 defined the default types from the bootloader side. This is compatible with how Xen interprets the modules with x86 multiboot and I think simplifies things for bootloaders which now need not contain similar guessing code if they only care about the most basic case. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 17 +++++++++++++++-- xen/arch/arm/setup.c | 14 ++++++++++++++ xen/include/asm-arm/setup.h | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ce7fdf2..e100233 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -165,6 +165,7 @@ static void __init process_multiboot_node(const void *fdt, int node, const char *name, u32 address_cells, u32 size_cells) { + static int kind_guess = 0; const struct fdt_property *prop; const __be32 *cell; bootmodule_kind kind; @@ -181,7 +182,18 @@ static void __init process_multiboot_node(const void *fdt, int node, else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) kind = BOOTMOD_XSM; else - panic("%s not a known xen multiboot type\n", name); + kind = BOOTMOD_UNKNOWN; + + /* Guess that first two unknown are kernel and ramdisk respectively. */ + if ( kind == BOOTMOD_UNKNOWN ) + { + switch ( kind_guess++ ) + { + case 0: kind = BOOTMOD_KERNEL; break; + case 1: kind = BOOTMOD_RAMDISK; break; + default: break; + } + } prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) @@ -281,10 +293,11 @@ static void __init early_print_info(void) mi->bank[i].start + mi->bank[i].size - 1); printk("\n"); for ( i = 0 ; i < mods->nr_mods; i++ ) - printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %-12s %s\n", i, mods->module[i].start, mods->module[i].start + mods->module[i].size, + boot_module_kind_as_string(mods->module[i].kind), mods->module[i].cmdline); nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); for ( i = 0; i < nr_rsvd; i++ ) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 0cbe552..e53e491 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -223,6 +223,20 @@ struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) return NULL; } +const char * __init boot_module_kind_as_string(bootmodule_kind kind) +{ + switch ( kind ) + { + case BOOTMOD_XEN: return "Xen"; + case BOOTMOD_FDT: return "Device Tree"; + case BOOTMOD_KERNEL: return "Kernel"; + case BOOTMOD_RAMDISK: return "Ramdisk"; + case BOOTMOD_XSM: return "XSM"; + case BOOTMOD_UNKNOWN: return "Unknown"; + default: BUG(); + } +} + void __init discard_initial_modules(void) { struct bootmodules *mi = &bootinfo.modules; diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index e2e18c3..36e5704 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -64,6 +64,7 @@ struct bootmodule *add_boot_module(bootmodule_kind kind, paddr_t start, paddr_t size, const char *cmdline); struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); +const char * __init boot_module_kind_as_string(bootmodule_kind kind); #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 Tue Jul 22 03:01:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKy-0007eO-4S; Tue, 22 Jul 2014 03:01:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKx-0007e8-5C for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:55 +0000 Received: from [85.158.143.35:60881] by server-1.bemta-4.messagelabs.com id FC/9D-30046-224DDC35; Tue, 22 Jul 2014 03:01:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1405998112!19198901!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11021 invoked from network); 22 Jul 2014 03:01:53 -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 Jul 2014 03:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKu-0003lU-Ll for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKu-0002U7-KL for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:52 +0000 Date: Tue, 22 Jul 2014 03:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update multiboot device tree bindings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99195c767be1ddafb805327db11ef63973b43093 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:19 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:18:04 2014 +0100 xen: arm: update multiboot device tree bindings. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 54 +++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bfb8d01..d967061 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -8,15 +8,31 @@ Each node contains the following properties: - compatible - Must be: + Must always include at least the generic compatiblity string: - "xen,", "xen,multiboot-module" + "multiboot,module" - where must be one of: + Optionally a more specific compatible string may be used in + addition to the above. One of: - - "linux-zimage" -- the dom0 kernel - - "linux-initrd" -- the dom0 ramdisk - - "xsm-policy" -- XSM policy blob + - "multiboot,kernel" -- the dom0 kernel + - "multiboot,ramdisk" -- the dom0 ramdisk + - "xen,xsm-policy" -- XSM policy blob + + It is normally recommended to include a more specific + compatible string (if one applies) in addition to the generic + string (which must always be present). + + Xen 4.4 supported a different set of legacy compatible strings + which remain supported such that systems supporting both 4.4 + and later can use a single DTB. + + - "xen,multiboot-module" equivalent to "multiboot,module" + - "xen,linux-zimage" equivalent to "multiboot,kernel" + - "xen,linux-initrd" equivalent to "multiboot,ramdisk" + + For compatibility with Xen 4.4 the more specific "xen,linux-*" + names are non-optional and must be included. - reg @@ -29,6 +45,32 @@ Each node contains the following properties: priority of this field vs. other mechanisms of specifying the bootargs for the kernel. +Examples +======== + +A boot module of unspecified type: + + module@0xc0000000 { + compatible = "multiboot,module"; + reg = <0xc0000000 0x1234>; + bootargs = "..."; + }; + +A boot module containing a ramdisk: + + module@0xd0000000 { + compatible = "multiboot,ramdisk", "multiboot,module"; + reg = <0xd0000000 0x5678>; + }; + +The previous examples are compatible with Xen 4.5+ only. + +To be compatible with Xen 4.4 as well use the legacy names: + + module@0xd0000000 { + compatible = "xen,linux-initrd", "xen,multiboot-module"; + reg = <0xd0000000 0x5678>; + }; Command lines ============= -- generated by git-patchbot for /home/xen/git/xen.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 Jul 22 03:01:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Jul 2014 03:01: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 1X9QKy-0007eO-4S; Tue, 22 Jul 2014 03:01:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKx-0007e8-5C for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:55 +0000 Received: from [85.158.143.35:60881] by server-1.bemta-4.messagelabs.com id FC/9D-30046-224DDC35; Tue, 22 Jul 2014 03:01:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1405998112!19198901!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11021 invoked from network); 22 Jul 2014 03:01:53 -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 Jul 2014 03:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9QKu-0003lU-Ll for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1X9QKu-0002U7-KL for xen-changelog@lists.xensource.com; Tue, 22 Jul 2014 03:01:52 +0000 Date: Tue, 22 Jul 2014 03:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update multiboot device tree bindings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99195c767be1ddafb805327db11ef63973b43093 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:19 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 21 12:18:04 2014 +0100 xen: arm: update multiboot device tree bindings. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 54 +++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bfb8d01..d967061 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -8,15 +8,31 @@ Each node contains the following properties: - compatible - Must be: + Must always include at least the generic compatiblity string: - "xen,", "xen,multiboot-module" + "multiboot,module" - where must be one of: + Optionally a more specific compatible string may be used in + addition to the above. One of: - - "linux-zimage" -- the dom0 kernel - - "linux-initrd" -- the dom0 ramdisk - - "xsm-policy" -- XSM policy blob + - "multiboot,kernel" -- the dom0 kernel + - "multiboot,ramdisk" -- the dom0 ramdisk + - "xen,xsm-policy" -- XSM policy blob + + It is normally recommended to include a more specific + compatible string (if one applies) in addition to the generic + string (which must always be present). + + Xen 4.4 supported a different set of legacy compatible strings + which remain supported such that systems supporting both 4.4 + and later can use a single DTB. + + - "xen,multiboot-module" equivalent to "multiboot,module" + - "xen,linux-zimage" equivalent to "multiboot,kernel" + - "xen,linux-initrd" equivalent to "multiboot,ramdisk" + + For compatibility with Xen 4.4 the more specific "xen,linux-*" + names are non-optional and must be included. - reg @@ -29,6 +45,32 @@ Each node contains the following properties: priority of this field vs. other mechanisms of specifying the bootargs for the kernel. +Examples +======== + +A boot module of unspecified type: + + module@0xc0000000 { + compatible = "multiboot,module"; + reg = <0xc0000000 0x1234>; + bootargs = "..."; + }; + +A boot module containing a ramdisk: + + module@0xd0000000 { + compatible = "multiboot,ramdisk", "multiboot,module"; + reg = <0xd0000000 0x5678>; + }; + +The previous examples are compatible with Xen 4.5+ only. + +To be compatible with Xen 4.4 as well use the legacy names: + + module@0xd0000000 { + compatible = "xen,linux-initrd", "xen,multiboot-module"; + reg = <0xd0000000 0x5678>; + }; Command lines ============= -- generated by git-patchbot for /home/xen/git/xen.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 Jul 24 15:11:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15:11: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 1XAKfj-0001LE-72; Thu, 24 Jul 2014 15:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfi-0001Kz-CG for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:06 +0000 Received: from [85.158.137.68:38382] by server-9.bemta-3.messagelabs.com id 86/5C-30790-90221D35; Thu, 24 Jul 2014 15:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1406214663!17878438!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19314 invoked from network); 24 Jul 2014 15:11:04 -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; 24 Jul 2014 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKff-00010h-Lm for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKff-00074E-J7 for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:03 +0000 Date: Thu, 24 Jul 2014 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: Install arch-arm directory 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 99860894b3b310d01935417a3f2ea4dc1f838936 Author: Julien Grall AuthorDate: Tue Jul 8 18:04:48 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:26 2014 +0100 xen: Install arch-arm directory headers Some headers for ARM are not installed on the host. This may make external software relying on Xen headers failed to compile on ARM. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit f224b60791b539df66c1fe89d7866170653428b6) --- tools/include/Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index 9ed41f1..f7a6256 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -13,7 +13,7 @@ xen/.dir: mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen - ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign @@ -23,6 +23,8 @@ xen/.dir: install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io @@ -32,6 +34,11 @@ install: all $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + +# xen/arch-arm doesn't contains headers for now. Uncommented the line +# as soon as a new header is added +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io -- 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 Thu Jul 24 15:11:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15:11: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 1XAKfj-0001LE-72; Thu, 24 Jul 2014 15:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfi-0001Kz-CG for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:06 +0000 Received: from [85.158.137.68:38382] by server-9.bemta-3.messagelabs.com id 86/5C-30790-90221D35; Thu, 24 Jul 2014 15:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1406214663!17878438!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19314 invoked from network); 24 Jul 2014 15:11:04 -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; 24 Jul 2014 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKff-00010h-Lm for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKff-00074E-J7 for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:03 +0000 Date: Thu, 24 Jul 2014 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: Install arch-arm directory 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 99860894b3b310d01935417a3f2ea4dc1f838936 Author: Julien Grall AuthorDate: Tue Jul 8 18:04:48 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:26 2014 +0100 xen: Install arch-arm directory headers Some headers for ARM are not installed on the host. This may make external software relying on Xen headers failed to compile on ARM. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit f224b60791b539df66c1fe89d7866170653428b6) --- tools/include/Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index 9ed41f1..f7a6256 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -13,7 +13,7 @@ xen/.dir: mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen - ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign @@ -23,6 +23,8 @@ xen/.dir: install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io @@ -32,6 +34,11 @@ install: all $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + +# xen/arch-arm doesn't contains headers for now. Uncommented the line +# as soon as a new header is added +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io -- 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 Thu Jul 24 15:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKft-0001N0-9b; Thu, 24 Jul 2014 15:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfs-0001Mf-Bl for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:16 +0000 Received: from [85.158.143.35:47587] by server-2.bemta-4.messagelabs.com id 6B/44-04525-31221D35; Thu, 24 Jul 2014 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1406214674!19915264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1484 invoked from network); 24 Jul 2014 15:11: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; 24 Jul 2014 15:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfp-00010m-RS for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKfp-00074d-Pd for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:13 +0000 Date: Thu, 24 Jul 2014 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: use physical processor ID (MPIDR) when calling psci CPU_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 af9b51becddf0ea383f867542830f613a617919a Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:47 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:30 2014 +0100 xen: arm: use physical processor ID (MPIDR) when calling psci CPU_ON Xen's logical CPU map can differ from the underlying layout. Also add an emacs magic block to this file. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit d99504872178523b024bfb36736b158a42c5060e) --- xen/arch/arm/psci.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 25a8697..b6360d5 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -54,7 +54,8 @@ static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, cpu, __pa(init_secondary), 0); + return __invoke_psci_fn_smc(psci_cpu_on_nr, + cpu_logical_map(cpu), __pa(init_secondary), 0); } int __init psci_init(void) @@ -96,3 +97,12 @@ int __init psci_init(void) return 0; } + +/* + * 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#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 Thu Jul 24 15:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKft-0001N0-9b; Thu, 24 Jul 2014 15:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfs-0001Mf-Bl for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:16 +0000 Received: from [85.158.143.35:47587] by server-2.bemta-4.messagelabs.com id 6B/44-04525-31221D35; Thu, 24 Jul 2014 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1406214674!19915264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1484 invoked from network); 24 Jul 2014 15:11: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; 24 Jul 2014 15:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKfp-00010m-RS for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKfp-00074d-Pd for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:13 +0000 Date: Thu, 24 Jul 2014 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: use physical processor ID (MPIDR) when calling psci CPU_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 af9b51becddf0ea383f867542830f613a617919a Author: Ian Campbell AuthorDate: Mon Jul 14 17:21:47 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:30 2014 +0100 xen: arm: use physical processor ID (MPIDR) when calling psci CPU_ON Xen's logical CPU map can differ from the underlying layout. Also add an emacs magic block to this file. Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit d99504872178523b024bfb36736b158a42c5060e) --- xen/arch/arm/psci.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 25a8697..b6360d5 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -54,7 +54,8 @@ static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, cpu, __pa(init_secondary), 0); + return __invoke_psci_fn_smc(psci_cpu_on_nr, + cpu_logical_map(cpu), __pa(init_secondary), 0); } int __init psci_init(void) @@ -96,3 +97,12 @@ int __init psci_init(void) return 0; } + +/* + * 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#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 Thu Jul 24 15:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15: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 1XAKg4-0001P5-CX; Thu, 24 Jul 2014 15:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKg2-0001On-Pe for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:26 +0000 Received: from [85.158.137.68:40338] by server-15.bemta-3.messagelabs.com id 66/EA-14271-E1221D35; Thu, 24 Jul 2014 15:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1406214684!17878544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21618 invoked from network); 24 Jul 2014 15:11:25 -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; 24 Jul 2014 15:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKg0-00010y-3n for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKg0-000753-0L for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:24 +0000 Date: Thu, 24 Jul 2014 15:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7adf0b22d888bd0514d153c8b44e4982ad4d6e6e Author: Ian Campbell AuthorDate: Mon Jul 14 17:39:10 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:33 2014 +0100 xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables Otherwise a stale TLB entry can shadow the fixmap/UART or DTB mapping Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit f1870804e58565399cd770e93f62e7ce57cd5231) --- xen/arch/arm/arm32/head.S | 13 ++++++++++++- xen/arch/arm/arm64/head.S | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 96230ac..5bc23cc 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -372,9 +372,20 @@ paging: ldr r4, =BOOT_FDT_VIRT_START mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ - dsb 1: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb /* Ensure any page table updates made above + * have occurred. */ + + isb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 31afdd0..be44f67 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -382,9 +382,20 @@ paging: ldr x1, =BOOT_FDT_VIRT_START lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ str x2, [x4, x1] /* Map it in the early fdt slot */ - dsb sy 1: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb sy /* Ensure any page table updates made above + * have occurred. */ + + isb + tlbi alle2 + dsb sy /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ -- 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 Thu Jul 24 15:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15: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 1XAKg4-0001P5-CX; Thu, 24 Jul 2014 15:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKg2-0001On-Pe for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:26 +0000 Received: from [85.158.137.68:40338] by server-15.bemta-3.messagelabs.com id 66/EA-14271-E1221D35; Thu, 24 Jul 2014 15:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1406214684!17878544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21618 invoked from network); 24 Jul 2014 15:11:25 -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; 24 Jul 2014 15:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKg0-00010y-3n for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKg0-000753-0L for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:24 +0000 Date: Thu, 24 Jul 2014 15:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7adf0b22d888bd0514d153c8b44e4982ad4d6e6e Author: Ian Campbell AuthorDate: Mon Jul 14 17:39:10 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:33 2014 +0100 xen: arm: flush TLB after overwriting 1:1 mapping in boot page tables Otherwise a stale TLB entry can shadow the fixmap/UART or DTB mapping Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit f1870804e58565399cd770e93f62e7ce57cd5231) --- xen/arch/arm/arm32/head.S | 13 ++++++++++++- xen/arch/arm/arm64/head.S | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 96230ac..5bc23cc 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -372,9 +372,20 @@ paging: ldr r4, =BOOT_FDT_VIRT_START mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ - dsb 1: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb /* Ensure any page table updates made above + * have occurred. */ + + isb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 31afdd0..be44f67 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -382,9 +382,20 @@ paging: ldr x1, =BOOT_FDT_VIRT_START lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ str x2, [x4, x1] /* Map it in the early fdt slot */ - dsb sy 1: + /* + * Flush the TLB in case the 1:1 mapping happens to clash with + * the virtual addresses used by the fixmap or DTB. + */ + dsb sy /* Ensure any page table updates made above + * have occurred. */ + + isb + tlbi alle2 + dsb sy /* Ensure completion of TLB flush */ + isb + PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ -- 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 Thu Jul 24 15:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15: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 1XAKgE-0001Qh-F6; Thu, 24 Jul 2014 15:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKgD-0001QY-Aw for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:37 +0000 Received: from [193.109.254.147:10733] by server-9.bemta-14.messagelabs.com id EC/4C-31535-82221D35; Thu, 24 Jul 2014 15:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1406214694!14769380!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3936 invoked from network); 24 Jul 2014 15:11:35 -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; 24 Jul 2014 15:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKgA-000116-GM for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKgA-00075X-7m for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:34 +0000 Date: Thu, 24 Jul 2014 15:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: implement generic multiboot compatibility strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad187c347082d2b4cdef1cd47938017693251074 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:11 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:36 2014 +0100 xen: arm: implement generic multiboot compatibility strings This causes Xen to accept the more generic names specified in http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot as of 2014-06-06. These names are more generic than those proposed by Andre in http://thread.gmane.org/gmane.linux.linaro.announce.boot/326 and those used in earlier drafts of the /Multiboot wiki page. This will allow bootloaders to not special case Xen (or at least to reduce the amount which is required). Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit a860dfeec090fe46d856b5d3fc6da28ccf7d1ba5) --- xen/common/device_tree.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 55716a8..2ebacb2 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -350,9 +350,11 @@ static void __init process_multiboot_node(const void *fdt, int node, struct dt_mb_module *mod; int len; - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) nr = MOD_INITRD; else early_panic("%s not a known xen multiboot type\n", name); @@ -443,7 +445,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells); -- 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 Thu Jul 24 15:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 24 Jul 2014 15: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 1XAKgE-0001Qh-F6; Thu, 24 Jul 2014 15:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKgD-0001QY-Aw for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:37 +0000 Received: from [193.109.254.147:10733] by server-9.bemta-14.messagelabs.com id EC/4C-31535-82221D35; Thu, 24 Jul 2014 15:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1406214694!14769380!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3936 invoked from network); 24 Jul 2014 15:11:35 -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; 24 Jul 2014 15:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAKgA-000116-GM for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAKgA-00075X-7m for xen-changelog@lists.xensource.com; Thu, 24 Jul 2014 15:11:34 +0000 Date: Thu, 24 Jul 2014 15:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: implement generic multiboot compatibility strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad187c347082d2b4cdef1cd47938017693251074 Author: Ian Campbell AuthorDate: Fri Jul 18 14:08:11 2014 +0100 Commit: Ian Campbell CommitDate: Wed Jul 23 09:50:36 2014 +0100 xen: arm: implement generic multiboot compatibility strings This causes Xen to accept the more generic names specified in http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot as of 2014-06-06. These names are more generic than those proposed by Andre in http://thread.gmane.org/gmane.linux.linaro.announce.boot/326 and those used in earlier drafts of the /Multiboot wiki page. This will allow bootloaders to not special case Xen (or at least to reduce the amount which is required). Signed-off-by: Ian Campbell Acked-by: Julien Grall (cherry picked from commit a860dfeec090fe46d856b5d3fc6da28ccf7d1ba5) --- xen/common/device_tree.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 55716a8..2ebacb2 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -350,9 +350,11 @@ static void __init process_multiboot_node(const void *fdt, int node, struct dt_mb_module *mod; int len; - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) nr = MOD_INITRD; else early_panic("%s not a known xen multiboot type\n", name); @@ -443,7 +445,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells); -- 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 Jul 25 06:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 25 Jul 2014 06:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ41-0000un-KE; Fri, 25 Jul 2014 06:33:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ40-0000uf-Gd for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:08 +0000 Received: from [85.158.143.35:51986] by server-1.bemta-4.messagelabs.com id 6D/B3-05872-32AF1D35; Fri, 25 Jul 2014 06:33:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1406269986!12017378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14406 invoked from network); 25 Jul 2014 06:33:07 -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; 25 Jul 2014 06:33:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ3v-0001tQ-Ro for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAZ3v-0005QF-G8 for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:03 +0000 Message-Id: Date: Fri, 25 Jul 2014 06:33:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: fix error return code in xen_pcibk_attach() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Wei Yongjun # Date 1406269378 -7200 # Node ID 52f54ddbf4495d75384fc00caa075c42d4a6c3fd # Parent ca51c3ea6ffd43202ba0435f2cdb012e28cae09e pciback: fix error return code in xen_pcibk_attach() Fix to return -EFAULT from the error handling case instead of 0 when version mismatch with pcifront. Signed-off-by: Wei Yongjun Use -EILSEQ/-ENODATA instead of -EFAULT. Signed-off-by Jan Beulich Committed-by: Jan Beulich --- diff -r ca51c3ea6ffd -r 52f54ddbf449 drivers/xen/pciback/xenbus.c --- a/drivers/xen/pciback/xenbus.c Fri Jul 04 12:10:22 2014 +0200 +++ b/drivers/xen/pciback/xenbus.c Fri Jul 25 08:22:58 2014 +0200 @@ -145,7 +145,8 @@ static int pciback_attach(struct pciback } if (magic == NULL || strcmp(magic, XEN_PCI_MAGIC) != 0) { - xenbus_dev_fatal(pdev->xdev, -EFAULT, + err = magic ? -EILSEQ : -ENODATA; + xenbus_dev_fatal(pdev->xdev, err, "version mismatch (%s/%s) with pcifront - " "halting pciback", magic, XEN_PCI_MAGIC); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 25 06:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 25 Jul 2014 06:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ41-0000un-KE; Fri, 25 Jul 2014 06:33:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ40-0000uf-Gd for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:08 +0000 Received: from [85.158.143.35:51986] by server-1.bemta-4.messagelabs.com id 6D/B3-05872-32AF1D35; Fri, 25 Jul 2014 06:33:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1406269986!12017378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14406 invoked from network); 25 Jul 2014 06:33:07 -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; 25 Jul 2014 06:33:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAZ3v-0001tQ-Ro for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XAZ3v-0005QF-G8 for xen-changelog@lists.xensource.com; Fri, 25 Jul 2014 06:33:03 +0000 Message-Id: Date: Fri, 25 Jul 2014 06:33:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: fix error return code in xen_pcibk_attach() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Wei Yongjun # Date 1406269378 -7200 # Node ID 52f54ddbf4495d75384fc00caa075c42d4a6c3fd # Parent ca51c3ea6ffd43202ba0435f2cdb012e28cae09e pciback: fix error return code in xen_pcibk_attach() Fix to return -EFAULT from the error handling case instead of 0 when version mismatch with pcifront. Signed-off-by: Wei Yongjun Use -EILSEQ/-ENODATA instead of -EFAULT. Signed-off-by Jan Beulich Committed-by: Jan Beulich --- diff -r ca51c3ea6ffd -r 52f54ddbf449 drivers/xen/pciback/xenbus.c --- a/drivers/xen/pciback/xenbus.c Fri Jul 04 12:10:22 2014 +0200 +++ b/drivers/xen/pciback/xenbus.c Fri Jul 25 08:22:58 2014 +0200 @@ -145,7 +145,8 @@ static int pciback_attach(struct pciback } if (magic == NULL || strcmp(magic, XEN_PCI_MAGIC) != 0) { - xenbus_dev_fatal(pdev->xdev, -EFAULT, + err = magic ? -EILSEQ : -ENODATA; + xenbus_dev_fatal(pdev->xdev, err, "version mismatch (%s/%s) with pcifront - " "halting pciback", magic, XEN_PCI_MAGIC); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 28 12:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwO-0007VZ-QS; Mon, 28 Jul 2014 12:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwN-0007VM-1V for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:07 +0000 Received: from [193.109.254.147:10469] by server-2.bemta-14.messagelabs.com id 63/39-09196-E6046D35; Mon, 28 Jul 2014 12:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1406550124!12218132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32139 invoked from network); 28 Jul 2014 12:22:05 -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; 28 Jul 2014 12:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwK-0001DG-2K for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwJ-0000az-Vb for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:04 +0000 Date: Mon, 28 Jul 2014 12:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Remove USER_MAPPINGS_ARE_GLOBAL definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb976b2e4a96eaa53e88723ce1ef87baeccb4ba2 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:01:28 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:01:28 2014 +0200 x86: Remove USER_MAPPINGS_ARE_GLOBAL definition It has been unconditionally enabled for 64bit Xen builds since 2006 c/s 6f562e72 "[XEN][X86_64] USe GLOBAL bit to build user mappings." Adjust the order of definitions in x86_64/page.h to put the bit definitions for pte flags together. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/flushtlb.c | 31 +++++++------------------------ xen/arch/x86/mm.c | 18 ++---------------- xen/arch/x86/x86_64/traps.c | 4 ---- xen/include/asm-x86/x86_64/page.h | 11 +++-------- 4 files changed, 12 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 1b75652..5d5d79c 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -72,7 +72,7 @@ static void post_flush(u32 t) void write_cr3(unsigned long cr3) { - unsigned long flags; + unsigned long flags, cr4 = read_cr4(); u32 t; /* This non-reentrant function is sometimes called in interrupt context. */ @@ -82,16 +82,9 @@ void write_cr3(unsigned long cr3) hvm_flush_guest_tlbs(); -#ifdef USER_MAPPINGS_ARE_GLOBAL - { - unsigned long cr4 = read_cr4(); - write_cr4(cr4 & ~X86_CR4_PGE); - asm volatile ( "mov %0, %%cr3" : : "r" (cr3) : "memory" ); - write_cr4(cr4); - } -#else + write_cr4(cr4 & ~X86_CR4_PGE); asm volatile ( "mov %0, %%cr3" : : "r" (cr3) : "memory" ); -#endif + write_cr4(cr4); post_flush(t); @@ -123,23 +116,13 @@ void flush_area_local(const void *va, unsigned int flags) else { u32 t = pre_flush(); + unsigned long cr4 = read_cr4(); hvm_flush_guest_tlbs(); -#ifndef USER_MAPPINGS_ARE_GLOBAL - if ( !(flags & FLUSH_TLB_GLOBAL) || !(read_cr4() & X86_CR4_PGE) ) - { - asm volatile ( "mov %0, %%cr3" - : : "r" (read_cr3()) : "memory" ); - } - else -#endif - { - unsigned long cr4 = read_cr4(); - write_cr4(cr4 & ~X86_CR4_PGE); - barrier(); - write_cr4(cr4); - } + write_cr4(cr4 & ~X86_CR4_PGE); + barrier(); + write_cr4(cr4); post_flush(t); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 2543916..d23cb3f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -162,7 +162,8 @@ boolean_param("allowsuperpage", opt_allow_superpage); static void put_superpage(unsigned long mfn); static uint32_t base_disallow_mask; -#define L1_DISALLOW_MASK (base_disallow_mask | _PAGE_GNTTAB) +/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */ +#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL) #define L2_DISALLOW_MASK (base_disallow_mask & ~_PAGE_PSE) #define l3_disallow_mask(d) (!is_pv_32on64_domain(d) ? \ @@ -171,12 +172,6 @@ static uint32_t base_disallow_mask; #define L4_DISALLOW_MASK (base_disallow_mask) -#ifdef USER_MAPPINGS_ARE_GLOBAL -/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */ -#undef L1_DISALLOW_MASK -#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL) -#endif - #define l1_disallow_mask(d) \ ((d != dom_io) && \ (rangeset_is_empty((d)->iomem_caps) && \ @@ -994,7 +989,6 @@ get_page_from_l4e( return rc; } -#ifdef USER_MAPPINGS_ARE_GLOBAL #define adjust_guest_l1e(pl1e, d) \ do { \ if ( likely(l1e_get_flags((pl1e)) & _PAGE_PRESENT) && \ @@ -1011,14 +1005,6 @@ get_page_from_l4e( l1e_add_flags((pl1e), (_PAGE_GLOBAL|_PAGE_USER)); \ } \ } while ( 0 ) -#else -#define adjust_guest_l1e(pl1e, d) \ - do { \ - if ( likely(l1e_get_flags((pl1e)) & _PAGE_PRESENT) && \ - likely(!is_pv_32on64_domain(d)) ) \ - l1e_add_flags((pl1e), _PAGE_USER); \ - } while ( 0 ) -#endif #define adjust_guest_l2e(pl2e, d) \ do { \ diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 650c33d..0040bef 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -266,12 +266,8 @@ void toggle_guest_mode(struct vcpu *v) v->arch.flags ^= TF_kernel_mode; asm volatile ( "swapgs" ); update_cr3(v); -#ifdef USER_MAPPINGS_ARE_GLOBAL /* Don't flush user global mappings from the TLB. Don't tick TLB clock. */ asm volatile ( "mov %0, %%cr3" : : "r" (v->arch.cr3) : "memory" ); -#else - write_ptbase(v); -#endif if ( !(v->arch.flags & TF_kernel_mode) ) return; diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index c193c88..3eee5b5 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -161,20 +161,15 @@ typedef l4_pgentry_t root_pgentry_t; /* Bit 22 of a 24-bit flag mask. This corresponds to bit 62 of a pte.*/ #define _PAGE_GNTTAB (1U<<22) -#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) -#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) - -#define USER_MAPPINGS_ARE_GLOBAL -#ifdef USER_MAPPINGS_ARE_GLOBAL /* * Bit 12 of a 24-bit flag mask. This corresponds to bit 52 of a pte. * This is needed to distinguish between user and kernel PTEs since _PAGE_USER * is asserted for both. */ #define _PAGE_GUEST_KERNEL (1U<<12) -#else -#define _PAGE_GUEST_KERNEL 0 -#endif + +#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) #endif /* __X86_64_PAGE_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 Mon Jul 28 12:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwO-0007VZ-QS; Mon, 28 Jul 2014 12:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwN-0007VM-1V for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:07 +0000 Received: from [193.109.254.147:10469] by server-2.bemta-14.messagelabs.com id 63/39-09196-E6046D35; Mon, 28 Jul 2014 12:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1406550124!12218132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32139 invoked from network); 28 Jul 2014 12:22:05 -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; 28 Jul 2014 12:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwK-0001DG-2K for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwJ-0000az-Vb for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:04 +0000 Date: Mon, 28 Jul 2014 12:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Remove USER_MAPPINGS_ARE_GLOBAL definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb976b2e4a96eaa53e88723ce1ef87baeccb4ba2 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:01:28 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:01:28 2014 +0200 x86: Remove USER_MAPPINGS_ARE_GLOBAL definition It has been unconditionally enabled for 64bit Xen builds since 2006 c/s 6f562e72 "[XEN][X86_64] USe GLOBAL bit to build user mappings." Adjust the order of definitions in x86_64/page.h to put the bit definitions for pte flags together. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/flushtlb.c | 31 +++++++------------------------ xen/arch/x86/mm.c | 18 ++---------------- xen/arch/x86/x86_64/traps.c | 4 ---- xen/include/asm-x86/x86_64/page.h | 11 +++-------- 4 files changed, 12 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 1b75652..5d5d79c 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -72,7 +72,7 @@ static void post_flush(u32 t) void write_cr3(unsigned long cr3) { - unsigned long flags; + unsigned long flags, cr4 = read_cr4(); u32 t; /* This non-reentrant function is sometimes called in interrupt context. */ @@ -82,16 +82,9 @@ void write_cr3(unsigned long cr3) hvm_flush_guest_tlbs(); -#ifdef USER_MAPPINGS_ARE_GLOBAL - { - unsigned long cr4 = read_cr4(); - write_cr4(cr4 & ~X86_CR4_PGE); - asm volatile ( "mov %0, %%cr3" : : "r" (cr3) : "memory" ); - write_cr4(cr4); - } -#else + write_cr4(cr4 & ~X86_CR4_PGE); asm volatile ( "mov %0, %%cr3" : : "r" (cr3) : "memory" ); -#endif + write_cr4(cr4); post_flush(t); @@ -123,23 +116,13 @@ void flush_area_local(const void *va, unsigned int flags) else { u32 t = pre_flush(); + unsigned long cr4 = read_cr4(); hvm_flush_guest_tlbs(); -#ifndef USER_MAPPINGS_ARE_GLOBAL - if ( !(flags & FLUSH_TLB_GLOBAL) || !(read_cr4() & X86_CR4_PGE) ) - { - asm volatile ( "mov %0, %%cr3" - : : "r" (read_cr3()) : "memory" ); - } - else -#endif - { - unsigned long cr4 = read_cr4(); - write_cr4(cr4 & ~X86_CR4_PGE); - barrier(); - write_cr4(cr4); - } + write_cr4(cr4 & ~X86_CR4_PGE); + barrier(); + write_cr4(cr4); post_flush(t); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 2543916..d23cb3f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -162,7 +162,8 @@ boolean_param("allowsuperpage", opt_allow_superpage); static void put_superpage(unsigned long mfn); static uint32_t base_disallow_mask; -#define L1_DISALLOW_MASK (base_disallow_mask | _PAGE_GNTTAB) +/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */ +#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL) #define L2_DISALLOW_MASK (base_disallow_mask & ~_PAGE_PSE) #define l3_disallow_mask(d) (!is_pv_32on64_domain(d) ? \ @@ -171,12 +172,6 @@ static uint32_t base_disallow_mask; #define L4_DISALLOW_MASK (base_disallow_mask) -#ifdef USER_MAPPINGS_ARE_GLOBAL -/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */ -#undef L1_DISALLOW_MASK -#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL) -#endif - #define l1_disallow_mask(d) \ ((d != dom_io) && \ (rangeset_is_empty((d)->iomem_caps) && \ @@ -994,7 +989,6 @@ get_page_from_l4e( return rc; } -#ifdef USER_MAPPINGS_ARE_GLOBAL #define adjust_guest_l1e(pl1e, d) \ do { \ if ( likely(l1e_get_flags((pl1e)) & _PAGE_PRESENT) && \ @@ -1011,14 +1005,6 @@ get_page_from_l4e( l1e_add_flags((pl1e), (_PAGE_GLOBAL|_PAGE_USER)); \ } \ } while ( 0 ) -#else -#define adjust_guest_l1e(pl1e, d) \ - do { \ - if ( likely(l1e_get_flags((pl1e)) & _PAGE_PRESENT) && \ - likely(!is_pv_32on64_domain(d)) ) \ - l1e_add_flags((pl1e), _PAGE_USER); \ - } while ( 0 ) -#endif #define adjust_guest_l2e(pl2e, d) \ do { \ diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 650c33d..0040bef 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -266,12 +266,8 @@ void toggle_guest_mode(struct vcpu *v) v->arch.flags ^= TF_kernel_mode; asm volatile ( "swapgs" ); update_cr3(v); -#ifdef USER_MAPPINGS_ARE_GLOBAL /* Don't flush user global mappings from the TLB. Don't tick TLB clock. */ asm volatile ( "mov %0, %%cr3" : : "r" (v->arch.cr3) : "memory" ); -#else - write_ptbase(v); -#endif if ( !(v->arch.flags & TF_kernel_mode) ) return; diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index c193c88..3eee5b5 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -161,20 +161,15 @@ typedef l4_pgentry_t root_pgentry_t; /* Bit 22 of a 24-bit flag mask. This corresponds to bit 62 of a pte.*/ #define _PAGE_GNTTAB (1U<<22) -#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) -#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) - -#define USER_MAPPINGS_ARE_GLOBAL -#ifdef USER_MAPPINGS_ARE_GLOBAL /* * Bit 12 of a 24-bit flag mask. This corresponds to bit 52 of a pte. * This is needed to distinguish between user and kernel PTEs since _PAGE_USER * is asserted for both. */ #define _PAGE_GUEST_KERNEL (1U<<12) -#else -#define _PAGE_GUEST_KERNEL 0 -#endif + +#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) #endif /* __X86_64_PAGE_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 Mon Jul 28 12:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwY-0007Wp-T8; Mon, 28 Jul 2014 12:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwX-0007WU-B1 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:17 +0000 Received: from [85.158.137.68:47338] by server-16.bemta-3.messagelabs.com id 7E/E1-14115-87046D35; Mon, 28 Jul 2014 12:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406550134!14697557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13410 invoked from network); 28 Jul 2014 12:22: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; 28 Jul 2014 12:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwU-0001DJ-G9 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwU-0000bR-73 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:14 +0000 Date: Mon, 28 Jul 2014 12:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05377dede434c746e6708f055858378d20f619db Author: Juergen Gross AuthorDate: Wed Jul 23 18:03:19 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:03:19 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 4a0e569..73249d3 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -471,12 +471,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_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 Mon Jul 28 12:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwY-0007Wp-T8; Mon, 28 Jul 2014 12:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwX-0007WU-B1 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:17 +0000 Received: from [85.158.137.68:47338] by server-16.bemta-3.messagelabs.com id 7E/E1-14115-87046D35; Mon, 28 Jul 2014 12:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406550134!14697557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13410 invoked from network); 28 Jul 2014 12:22: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; 28 Jul 2014 12:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwU-0001DJ-G9 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwU-0000bR-73 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:14 +0000 Date: Mon, 28 Jul 2014 12:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05377dede434c746e6708f055858378d20f619db Author: Juergen Gross AuthorDate: Wed Jul 23 18:03:19 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:03:19 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 4a0e569..73249d3 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -471,12 +471,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_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 Mon Jul 28 12:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwi-0007YG-W3; Mon, 28 Jul 2014 12:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwh-0007Y3-6x for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:27 +0000 Content-Length: 1984 Received: from [85.158.143.35:31498] by server-3.bemta-4.messagelabs.com id 82/AA-06192-28046D35; Mon, 28 Jul 2014 12:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1406550145!11895992!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7069 invoked from network); 28 Jul 2014 12:22:25 -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; 28 Jul 2014 12:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwe-0001DS-NK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwe-0000cl-L5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:24 +0000 Date: Mon, 28 Jul 2014 12:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix pvh dom0 boot after dab11417d X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8112634714624301542==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8112634714624301542== Content-Length: 1572 Content-Transfer-Encoding: quoted-printable commit 9d2efbafb895d1a3b5d70823b59faf71701ff1f9 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:04:28 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:04:28 2014 +0200 x86: fix pvh dom0 boot after dab11417d Changeset dab11417d "x86/HVM: consolidate and sanitize CR4 guest reserved bit determination" did not take into account the fact that dom0 does not have a cpuid policy. As a result, PVH dom0s would be given unexpected #GP faults on boot. In addition to the restore case (where the toolstack has not had time to load a cpuid policy), unconditionally exempt the hardware domain from needing a policy. Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Andrew Cooper Tested-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ef2411c..db54814 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1738,7 +1738,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, unsigned int leaf1_ecx =3D 0, leaf1_edx =3D 0; unsigned int leaf7_0_ebx =3D 0, leaf7_0_ecx =3D 0; - if ( likely(!restore) ) + if ( !restore && !is_hardware_domain(v->domain) ) { unsigned int level; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8112634714624301542== 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 --===============8112634714624301542==-- From xen-changelog-bounces@lists.xen.org Mon Jul 28 12:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjwi-0007YG-W3; Mon, 28 Jul 2014 12:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwh-0007Y3-6x for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:27 +0000 Content-Length: 1984 Received: from [85.158.143.35:31498] by server-3.bemta-4.messagelabs.com id 82/AA-06192-28046D35; Mon, 28 Jul 2014 12:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1406550145!11895992!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7069 invoked from network); 28 Jul 2014 12:22:25 -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; 28 Jul 2014 12:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwe-0001DS-NK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwe-0000cl-L5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:24 +0000 Date: Mon, 28 Jul 2014 12:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix pvh dom0 boot after dab11417d X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8112634714624301542==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8112634714624301542== Content-Length: 1572 Content-Transfer-Encoding: quoted-printable commit 9d2efbafb895d1a3b5d70823b59faf71701ff1f9 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:04:28 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:04:28 2014 +0200 x86: fix pvh dom0 boot after dab11417d Changeset dab11417d "x86/HVM: consolidate and sanitize CR4 guest reserved bit determination" did not take into account the fact that dom0 does not have a cpuid policy. As a result, PVH dom0s would be given unexpected #GP faults on boot. In addition to the restore case (where the toolstack has not had time to load a cpuid policy), unconditionally exempt the hardware domain from needing a policy. Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Andrew Cooper Tested-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ef2411c..db54814 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1738,7 +1738,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, unsigned int leaf1_ecx =3D 0, leaf1_edx =3D 0; unsigned int leaf7_0_ebx =3D 0, leaf7_0_ecx =3D 0; - if ( likely(!restore) ) + if ( !restore && !is_hardware_domain(v->domain) ) { unsigned int level; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8112634714624301542== 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 --===============8112634714624301542==-- From xen-changelog-bounces@lists.xen.org Mon Jul 28 12:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjws-0007Zr-2R; Mon, 28 Jul 2014 12:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwr-0007Zc-Bp for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:37 +0000 Received: from [85.158.143.35:26049] by server-3.bemta-4.messagelabs.com id 13/EA-06192-C8046D35; Mon, 28 Jul 2014 12:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550155!11887976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27169 invoked from network); 28 Jul 2014 12:22:36 -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; 28 Jul 2014 12:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwo-0001Da-T0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwo-0000dH-Rz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:34 +0000 Date: Mon, 28 Jul 2014 12:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d570c1d0274cac3b333ef378af3325b3b69905e Author: Tamas K Lengyel AuthorDate: Wed Jul 23 18:05:11 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:05:11 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index db54814..fea6d05 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3200,6 +3200,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(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 Mon Jul 28 12:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjws-0007Zr-2R; Mon, 28 Jul 2014 12:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwr-0007Zc-Bp for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:37 +0000 Received: from [85.158.143.35:26049] by server-3.bemta-4.messagelabs.com id 13/EA-06192-C8046D35; Mon, 28 Jul 2014 12:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550155!11887976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27169 invoked from network); 28 Jul 2014 12:22:36 -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; 28 Jul 2014 12:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwo-0001Da-T0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwo-0000dH-Rz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:34 +0000 Date: Mon, 28 Jul 2014 12:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d570c1d0274cac3b333ef378af3325b3b69905e Author: Tamas K Lengyel AuthorDate: Wed Jul 23 18:05:11 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:05:11 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index db54814..fea6d05 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3200,6 +3200,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(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 Mon Jul 28 12:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjx2-0007bd-51; Mon, 28 Jul 2014 12:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjx1-0007bR-O5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:47 +0000 Received: from [85.158.139.211:56502] by server-16.bemta-5.messagelabs.com id 05/9F-01029-79046D35; Mon, 28 Jul 2014 12:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1406550165!12698387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9143 invoked from network); 28 Jul 2014 12:22:46 -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; 28 Jul 2014 12:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwz-0001Dg-3J for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwz-0000dj-0p for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:45 +0000 Date: Mon, 28 Jul 2014 12:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee75480b3c8856db9ef1aa45418f35ec0d78989d Author: Andrew Cooper AuthorDate: Wed Jul 23 18:07:11 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:07:11 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 7293f31..ec99266 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 642ec28..f213a39 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1290,8 +1290,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1310,7 +1319,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1418,11 +1427,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(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 Mon Jul 28 12:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjx2-0007bd-51; Mon, 28 Jul 2014 12:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjx1-0007bR-O5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:47 +0000 Received: from [85.158.139.211:56502] by server-16.bemta-5.messagelabs.com id 05/9F-01029-79046D35; Mon, 28 Jul 2014 12:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1406550165!12698387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9143 invoked from network); 28 Jul 2014 12:22:46 -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; 28 Jul 2014 12:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjwz-0001Dg-3J for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjwz-0000dj-0p for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:45 +0000 Date: Mon, 28 Jul 2014 12:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee75480b3c8856db9ef1aa45418f35ec0d78989d Author: Andrew Cooper AuthorDate: Wed Jul 23 18:07:11 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:07:11 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 7293f31..ec99266 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 642ec28..f213a39 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1290,8 +1290,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1310,7 +1319,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1418,11 +1427,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(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 Mon Jul 28 12:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjxD-0007df-83; Mon, 28 Jul 2014 12:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxB-0007dJ-T5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:58 +0000 Received: from [85.158.139.211:28691] by server-12.bemta-5.messagelabs.com id B8/68-22251-1A046D35; Mon, 28 Jul 2014 12:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1406550175!14626842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16914 invoked from network); 28 Jul 2014 12:22:56 -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; 28 Jul 2014 12:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjx9-0001Dp-AC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjx9-0000eB-93 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:55 +0000 Date: Mon, 28 Jul 2014 12:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:08:04 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:08:04 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 31 +++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 44 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fea6d05..51011ea 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6114,7 +6114,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index 40ae841..ba7e71e 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -663,6 +663,37 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "%pv mem_event: Too many unpause attempts\n", v); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index ec99266..79188b9 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f213a39..2c7bc0f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1158,7 +1158,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1319,7 +1319,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1414,7 +1414,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1440,7 +1440,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2f876f5..62a4785 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -214,6 +214,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_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 Mon Jul 28 12:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:22: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 1XBjxD-0007df-83; Mon, 28 Jul 2014 12:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxB-0007dJ-T5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:58 +0000 Received: from [85.158.139.211:28691] by server-12.bemta-5.messagelabs.com id B8/68-22251-1A046D35; Mon, 28 Jul 2014 12:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1406550175!14626842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16914 invoked from network); 28 Jul 2014 12:22:56 -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; 28 Jul 2014 12:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjx9-0001Dp-AC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjx9-0000eB-93 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:22:55 +0000 Date: Mon, 28 Jul 2014 12:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 Author: Andrew Cooper AuthorDate: Wed Jul 23 18:08:04 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:08:04 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 31 +++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 44 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fea6d05..51011ea 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6114,7 +6114,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index 40ae841..ba7e71e 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -663,6 +663,37 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "%pv mem_event: Too many unpause attempts\n", v); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index ec99266..79188b9 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f213a39..2c7bc0f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1158,7 +1158,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1319,7 +1319,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1414,7 +1414,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1440,7 +1440,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2f876f5..62a4785 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -214,6 +214,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_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 Mon Jul 28 12:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxN-0007fW-CM; Mon, 28 Jul 2014 12:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxL-0007fB-Ug for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:08 +0000 Received: from [85.158.139.211:29939] by server-3.bemta-5.messagelabs.com id DA/E9-13873-BA046D35; Mon, 28 Jul 2014 12:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406550185!17979409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5921 invoked from network); 28 Jul 2014 12:23:06 -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; 28 Jul 2014 12:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxJ-0001EO-Fc for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxJ-0000f6-Dk for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:05 +0000 Date: Mon, 28 Jul 2014 12:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/kexec: fix kexec on systems which boot in x2apic mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77ffa26374370c1c9805f9596f37a44d412a7fdb Author: Andrew Cooper AuthorDate: Wed Jul 23 18:08:47 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:08:47 2014 +0200 x86/kexec: fix kexec on systems which boot in x2apic mode Moving straight from fully disabled to x2apic mode is an illegal state transition, and causes an unconditional #GP fault. Bounce through xapic mode to avoid the fault. In addition, avoid bouncing through the various apic modes if the mode is already correct. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 0e5e302..bbcc0a1 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -314,7 +314,7 @@ void disable_local_APIC(void) ~(MSR_IA32_APICBASE_ENABLE|MSR_IA32_APICBASE_EXTD)); } - if ( kexecing ) + if ( kexecing && (current_local_apic_mode() != apic_boot_mode) ) { uint64_t msr_content; rdmsrl(MSR_IA32_APICBASE, msr_content); @@ -330,7 +330,9 @@ void disable_local_APIC(void) wrmsrl(MSR_IA32_APICBASE, msr_content); break; case APIC_MODE_X2APIC: - msr_content |= (MSR_IA32_APICBASE_ENABLE|MSR_IA32_APICBASE_EXTD); + msr_content |= MSR_IA32_APICBASE_ENABLE; + wrmsrl(MSR_IA32_APICBASE, msr_content); + msr_content |= MSR_IA32_APICBASE_EXTD; wrmsrl(MSR_IA32_APICBASE, msr_content); break; default: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxN-0007fW-CM; Mon, 28 Jul 2014 12:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxL-0007fB-Ug for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:08 +0000 Received: from [85.158.139.211:29939] by server-3.bemta-5.messagelabs.com id DA/E9-13873-BA046D35; Mon, 28 Jul 2014 12:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406550185!17979409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5921 invoked from network); 28 Jul 2014 12:23:06 -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; 28 Jul 2014 12:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxJ-0001EO-Fc for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxJ-0000f6-Dk for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:05 +0000 Date: Mon, 28 Jul 2014 12:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/kexec: fix kexec on systems which boot in x2apic mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77ffa26374370c1c9805f9596f37a44d412a7fdb Author: Andrew Cooper AuthorDate: Wed Jul 23 18:08:47 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:08:47 2014 +0200 x86/kexec: fix kexec on systems which boot in x2apic mode Moving straight from fully disabled to x2apic mode is an illegal state transition, and causes an unconditional #GP fault. Bounce through xapic mode to avoid the fault. In addition, avoid bouncing through the various apic modes if the mode is already correct. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 0e5e302..bbcc0a1 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -314,7 +314,7 @@ void disable_local_APIC(void) ~(MSR_IA32_APICBASE_ENABLE|MSR_IA32_APICBASE_EXTD)); } - if ( kexecing ) + if ( kexecing && (current_local_apic_mode() != apic_boot_mode) ) { uint64_t msr_content; rdmsrl(MSR_IA32_APICBASE, msr_content); @@ -330,7 +330,9 @@ void disable_local_APIC(void) wrmsrl(MSR_IA32_APICBASE, msr_content); break; case APIC_MODE_X2APIC: - msr_content |= (MSR_IA32_APICBASE_ENABLE|MSR_IA32_APICBASE_EXTD); + msr_content |= MSR_IA32_APICBASE_ENABLE; + wrmsrl(MSR_IA32_APICBASE, msr_content); + msr_content |= MSR_IA32_APICBASE_EXTD; wrmsrl(MSR_IA32_APICBASE, msr_content); break; default: -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxY-0007h9-F6; Mon, 28 Jul 2014 12:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxX-0007gx-6b for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:19 +0000 Received: from [85.158.137.68:58721] by server-15.bemta-3.messagelabs.com id F0/6E-14271-5B046D35; Mon, 28 Jul 2014 12:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406550195!14697853!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19564 invoked from network); 28 Jul 2014 12:23:16 -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; 28 Jul 2014 12:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxT-0001EU-MU for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxT-0000gV-Kh for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:15 +0000 Date: Mon, 28 Jul 2014 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: support multiple container files appended together X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0aacc28bd73ba32652e038c4aa7905d992f9db2b Author: Aravind Gopalakrishnan AuthorDate: Wed Jul 23 18:14:41 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:14:41 2014 +0200 x86, amd_ucode: support multiple container files appended together This patch adds support for parsing through multiple AMD container binaries concatenated together. It is a feature already present in Linux. Link to linux patch: http://lkml.kernel.org/r/1370463236-2115-3-git-send-email-jacob.shin@amd.com Other changes introduced: - Define HDR_SIZE's explicitly for code clarity. - Minor cleanup: Remove extra casts in that are used in install_equiv_cpu_table() Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich --- xen/arch/x86/microcode_amd.c | 142 +++++++++++++++++++++++++++++++++++------ 1 files changed, 121 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 4347548..14728a2 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -29,6 +29,10 @@ #define pr_debug(x...) ((void)0) +#define CONT_HDR_SIZE 12 +#define SECTION_HDR_SIZE 8 +#define PATCH_HDR_SIZE 32 + struct __packed equiv_cpu_entry { uint32_t installed_cpu; uint32_t fixed_errata_mask; @@ -124,30 +128,41 @@ static bool_t verify_patch_size(uint32_t patch_size) return (patch_size <= max_size); } +static bool_t find_equiv_cpu_id(const struct equiv_cpu_entry *equiv_cpu_table, + unsigned int current_cpu_id, + unsigned int *equiv_cpu_id) +{ + unsigned int i; + + if ( !equiv_cpu_table ) + return 0; + + for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ ) + { + if ( current_cpu_id == equiv_cpu_table[i].installed_cpu ) + { + *equiv_cpu_id = equiv_cpu_table[i].equiv_cpu & 0xffff; + return 1; + } + } + + return 0; +} + static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_amd *mc_header = mc_amd->mpb; const struct equiv_cpu_entry *equiv_cpu_table = mc_amd->equiv_cpu_table; unsigned int current_cpu_id; - unsigned int equiv_cpu_id = 0x0; - unsigned int i; + unsigned int equiv_cpu_id; /* We should bind the task to the CPU */ BUG_ON(cpu != raw_smp_processor_id()); current_cpu_id = cpuid_eax(0x00000001); - for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ ) - { - if ( current_cpu_id == equiv_cpu_table[i].installed_cpu ) - { - equiv_cpu_id = equiv_cpu_table[i].equiv_cpu & 0xffff; - break; - } - } - - if ( !equiv_cpu_id ) + if ( !find_equiv_cpu_id(equiv_cpu_table, current_cpu_id, &equiv_cpu_id) ) return 0; if ( (mc_header->processor_rev_id) != equiv_cpu_id ) @@ -260,7 +275,7 @@ static int get_ucode_from_buffer_amd( } memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len); - *offset = off + mpbuf->len + 8; + *offset = off + mpbuf->len + SECTION_HDR_SIZE; pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n", raw_smp_processor_id(), bufsize, mpbuf->len, off, @@ -272,14 +287,12 @@ static int get_ucode_from_buffer_amd( static int install_equiv_cpu_table( struct microcode_amd *mc_amd, - const uint32_t *buf, + const void *data, size_t *offset) { - const struct mpbhdr *mpbuf = (const struct mpbhdr *)&buf[1]; + const struct mpbhdr *mpbuf = data + *offset + 4; - /* No more data */ - if ( mpbuf->len + 12 >= *offset ) - return -EINVAL; + *offset += mpbuf->len + CONT_HDR_SIZE; /* add header length */ if ( mpbuf->type != UCODE_EQUIV_CPU_TABLE_TYPE ) { @@ -303,7 +316,32 @@ static int install_equiv_cpu_table( memcpy(mc_amd->equiv_cpu_table, mpbuf->data, mpbuf->len); mc_amd->equiv_cpu_table_size = mpbuf->len; - *offset = mpbuf->len + 12; /* add header length */ + return 0; +} + +static int container_fast_forward(const void *data, size_t size_left, size_t *offset) +{ + for ( ; ; ) + { + size_t size; + const uint32_t *header; + + if ( size_left < SECTION_HDR_SIZE ) + return -EINVAL; + + header = data + *offset; + + if ( header[0] == UCODE_MAGIC && + header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) + break; + + size = header[1] + SECTION_HDR_SIZE; + if ( size < PATCH_HDR_SIZE || size_left < size ) + return -EINVAL; + + size_left -= size; + *offset += size; + } return 0; } @@ -311,14 +349,18 @@ static int install_equiv_cpu_table( static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; - size_t offset = bufsize; + size_t offset = 0; size_t last_offset, applied_offset = 0; int error = 0, save_error = 1; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int current_cpu_id; + unsigned int equiv_cpu_id; /* We should bind the task to the CPU */ BUG_ON(cpu != raw_smp_processor_id()); + current_cpu_id = cpuid_eax(0x00000001); + if ( *(const uint32_t *)buf != UCODE_MAGIC ) { printk(KERN_ERR "microcode: Wrong microcode patch file magic\n"); @@ -334,7 +376,41 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) goto out; } - error = install_equiv_cpu_table(mc_amd, buf, &offset); + /* + * Multiple container file support: + * 1. check if this container file has equiv_cpu_id match + * 2. If not, fast-fwd to next container file + */ + while ( offset < bufsize ) + { + error = install_equiv_cpu_table(mc_amd, buf, &offset); + + if ( !error && + find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + + /* + * Could happen as we advance 'offset' early + * in install_equiv_cpu_table + */ + if ( offset > bufsize ) + { + printk(KERN_ERR "microcode: Microcode buffer overrun\n"); + error = -EINVAL; + goto out; + } + + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error ) + { + printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" + "microcode: Failed to update patch level. " + "Current lvl:%#x\n", cpu, uci->cpu_sig.rev); + goto out; + } + } + if ( error ) { xfree(mc_amd); @@ -369,6 +445,30 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) if ( offset >= bufsize ) break; + + /* + * 1. Given a situation where multiple containers exist and correct + * patch lives on a container that is not the last container. + * 2. We match equivalent ids using find_equiv_cpu_id() from the + * earlier while() (On this case, matches on earlier container + * file and we break) + * 3. Proceed to while ( (error = get_ucode_from_buffer_amd(mc_amd, + * buf, bufsize,&offset)) == 0 ) + * 4. Find correct patch using microcode_fits() and apply the patch + * (Assume: apply_microcode() is successful) + * 5. The while() loop from (3) continues to parse the binary as + * there is a subsequent container file, but... + * 6. ...a correct patch can only be on one container and not on any + * subsequent ones. (Refer docs for more info) Therefore, we + * don't have to parse a subsequent container. So, we can abort + * the process here. + * 7. This ensures that we retain a success value (= 0) to 'error' + * before if ( mpbuf->type != UCODE_UCODE_TYPE ) evaluates to + * false and returns -EINVAL. + */ + if ( offset + SECTION_HDR_SIZE <= bufsize && + *(const uint32_t *)(buf + offset) == UCODE_MAGIC ) + break; } /* On success keep the microcode patch for -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxY-0007h9-F6; Mon, 28 Jul 2014 12:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxX-0007gx-6b for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:19 +0000 Received: from [85.158.137.68:58721] by server-15.bemta-3.messagelabs.com id F0/6E-14271-5B046D35; Mon, 28 Jul 2014 12:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406550195!14697853!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19564 invoked from network); 28 Jul 2014 12:23:16 -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; 28 Jul 2014 12:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxT-0001EU-MU for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxT-0000gV-Kh for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:15 +0000 Date: Mon, 28 Jul 2014 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: support multiple container files appended together X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0aacc28bd73ba32652e038c4aa7905d992f9db2b Author: Aravind Gopalakrishnan AuthorDate: Wed Jul 23 18:14:41 2014 +0200 Commit: Jan Beulich CommitDate: Wed Jul 23 18:14:41 2014 +0200 x86, amd_ucode: support multiple container files appended together This patch adds support for parsing through multiple AMD container binaries concatenated together. It is a feature already present in Linux. Link to linux patch: http://lkml.kernel.org/r/1370463236-2115-3-git-send-email-jacob.shin@amd.com Other changes introduced: - Define HDR_SIZE's explicitly for code clarity. - Minor cleanup: Remove extra casts in that are used in install_equiv_cpu_table() Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich --- xen/arch/x86/microcode_amd.c | 142 +++++++++++++++++++++++++++++++++++------ 1 files changed, 121 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 4347548..14728a2 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -29,6 +29,10 @@ #define pr_debug(x...) ((void)0) +#define CONT_HDR_SIZE 12 +#define SECTION_HDR_SIZE 8 +#define PATCH_HDR_SIZE 32 + struct __packed equiv_cpu_entry { uint32_t installed_cpu; uint32_t fixed_errata_mask; @@ -124,30 +128,41 @@ static bool_t verify_patch_size(uint32_t patch_size) return (patch_size <= max_size); } +static bool_t find_equiv_cpu_id(const struct equiv_cpu_entry *equiv_cpu_table, + unsigned int current_cpu_id, + unsigned int *equiv_cpu_id) +{ + unsigned int i; + + if ( !equiv_cpu_table ) + return 0; + + for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ ) + { + if ( current_cpu_id == equiv_cpu_table[i].installed_cpu ) + { + *equiv_cpu_id = equiv_cpu_table[i].equiv_cpu & 0xffff; + return 1; + } + } + + return 0; +} + static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_amd *mc_header = mc_amd->mpb; const struct equiv_cpu_entry *equiv_cpu_table = mc_amd->equiv_cpu_table; unsigned int current_cpu_id; - unsigned int equiv_cpu_id = 0x0; - unsigned int i; + unsigned int equiv_cpu_id; /* We should bind the task to the CPU */ BUG_ON(cpu != raw_smp_processor_id()); current_cpu_id = cpuid_eax(0x00000001); - for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ ) - { - if ( current_cpu_id == equiv_cpu_table[i].installed_cpu ) - { - equiv_cpu_id = equiv_cpu_table[i].equiv_cpu & 0xffff; - break; - } - } - - if ( !equiv_cpu_id ) + if ( !find_equiv_cpu_id(equiv_cpu_table, current_cpu_id, &equiv_cpu_id) ) return 0; if ( (mc_header->processor_rev_id) != equiv_cpu_id ) @@ -260,7 +275,7 @@ static int get_ucode_from_buffer_amd( } memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len); - *offset = off + mpbuf->len + 8; + *offset = off + mpbuf->len + SECTION_HDR_SIZE; pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n", raw_smp_processor_id(), bufsize, mpbuf->len, off, @@ -272,14 +287,12 @@ static int get_ucode_from_buffer_amd( static int install_equiv_cpu_table( struct microcode_amd *mc_amd, - const uint32_t *buf, + const void *data, size_t *offset) { - const struct mpbhdr *mpbuf = (const struct mpbhdr *)&buf[1]; + const struct mpbhdr *mpbuf = data + *offset + 4; - /* No more data */ - if ( mpbuf->len + 12 >= *offset ) - return -EINVAL; + *offset += mpbuf->len + CONT_HDR_SIZE; /* add header length */ if ( mpbuf->type != UCODE_EQUIV_CPU_TABLE_TYPE ) { @@ -303,7 +316,32 @@ static int install_equiv_cpu_table( memcpy(mc_amd->equiv_cpu_table, mpbuf->data, mpbuf->len); mc_amd->equiv_cpu_table_size = mpbuf->len; - *offset = mpbuf->len + 12; /* add header length */ + return 0; +} + +static int container_fast_forward(const void *data, size_t size_left, size_t *offset) +{ + for ( ; ; ) + { + size_t size; + const uint32_t *header; + + if ( size_left < SECTION_HDR_SIZE ) + return -EINVAL; + + header = data + *offset; + + if ( header[0] == UCODE_MAGIC && + header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) + break; + + size = header[1] + SECTION_HDR_SIZE; + if ( size < PATCH_HDR_SIZE || size_left < size ) + return -EINVAL; + + size_left -= size; + *offset += size; + } return 0; } @@ -311,14 +349,18 @@ static int install_equiv_cpu_table( static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; - size_t offset = bufsize; + size_t offset = 0; size_t last_offset, applied_offset = 0; int error = 0, save_error = 1; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int current_cpu_id; + unsigned int equiv_cpu_id; /* We should bind the task to the CPU */ BUG_ON(cpu != raw_smp_processor_id()); + current_cpu_id = cpuid_eax(0x00000001); + if ( *(const uint32_t *)buf != UCODE_MAGIC ) { printk(KERN_ERR "microcode: Wrong microcode patch file magic\n"); @@ -334,7 +376,41 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) goto out; } - error = install_equiv_cpu_table(mc_amd, buf, &offset); + /* + * Multiple container file support: + * 1. check if this container file has equiv_cpu_id match + * 2. If not, fast-fwd to next container file + */ + while ( offset < bufsize ) + { + error = install_equiv_cpu_table(mc_amd, buf, &offset); + + if ( !error && + find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + + /* + * Could happen as we advance 'offset' early + * in install_equiv_cpu_table + */ + if ( offset > bufsize ) + { + printk(KERN_ERR "microcode: Microcode buffer overrun\n"); + error = -EINVAL; + goto out; + } + + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error ) + { + printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" + "microcode: Failed to update patch level. " + "Current lvl:%#x\n", cpu, uci->cpu_sig.rev); + goto out; + } + } + if ( error ) { xfree(mc_amd); @@ -369,6 +445,30 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) if ( offset >= bufsize ) break; + + /* + * 1. Given a situation where multiple containers exist and correct + * patch lives on a container that is not the last container. + * 2. We match equivalent ids using find_equiv_cpu_id() from the + * earlier while() (On this case, matches on earlier container + * file and we break) + * 3. Proceed to while ( (error = get_ucode_from_buffer_amd(mc_amd, + * buf, bufsize,&offset)) == 0 ) + * 4. Find correct patch using microcode_fits() and apply the patch + * (Assume: apply_microcode() is successful) + * 5. The while() loop from (3) continues to parse the binary as + * there is a subsequent container file, but... + * 6. ...a correct patch can only be on one container and not on any + * subsequent ones. (Refer docs for more info) Therefore, we + * don't have to parse a subsequent container. So, we can abort + * the process here. + * 7. This ensures that we retain a success value (= 0) to 'error' + * before if ( mpbuf->type != UCODE_UCODE_TYPE ) evaluates to + * false and returns -EINVAL. + */ + if ( offset + SECTION_HDR_SIZE <= bufsize && + *(const uint32_t *)(buf + offset) == UCODE_MAGIC ) + break; } /* On success keep the microcode patch for -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxh-0007iJ-Hv; Mon, 28 Jul 2014 12:23:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxg-0007i7-Bz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:28 +0000 Received: from [85.158.143.35:44309] by server-3.bemta-4.messagelabs.com id F5/3C-06192-FB046D35; Mon, 28 Jul 2014 12:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550206!11888341!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5227 invoked from network); 28 Jul 2014 12:23:26 -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; 28 Jul 2014 12:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxd-0001Ea-Sj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxd-0000gy-RC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:25 +0000 Date: Mon, 28 Jul 2014 12:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] document IOMMU related command line 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 d193507d3ef208aca4807d386add3aa4c598fde7 Author: Jan Beulich AuthorDate: Thu Jul 24 08:58:10 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 24 08:58:10 2014 +0200 document IOMMU related command line options Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 94 ++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 1 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 94f04bd..3ff02bd 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -659,9 +659,101 @@ debug hypervisor only). ### ioapic\_ack ### iommu -### iommu\_inclusive\_mapping +> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` + +> Sub-options: + +> `` + +> Default: `on` + +>> Control the use of IOMMU(s) in the system. + +> All other sub-options are of boolean kind and can be prefixed with `no-` to +> effect the inverse meaning. + +> `force` or `required` + +> Default: `false` + +>> Don't continue booting unless IOMMU support is found and can be initialized +>> successfully. + +> `intremap` + +> Default: `true` + +>> Control the use of interrupt remapping (DMA remapping will always be enabled +>> if IOMMU functionality is enabled). + +> `qinval` (VT-d) + +> Default: `true` + +>> Control the use of Queued Invalidation. + +> `snoop` (Intel) + +> Default: `true` + +>> Control the use of Snoop Control. + +> `sharept` + +> Default: `true` + +>> Control whether CPU and IOMMU page tables should be shared. + +> `dom0-passthrough` + +> Default: `false` + +>> Control whether to disable DMA remapping for Dom0. + +> `dom0-strict` + +> Default: `false` + +>> Control whether to set up DMA remapping only for the memory Dom0 actually +>> got assigned. Implies `no-dom0-passthrough`. + +> `amd-iommu-perdev-intremap` + +> Default: `true` + +>> Control whether to set up interrupt remapping data structures per device +>> rather that once for the entire system. Turning this off is making PCI +>> device pass-through insecure and hence unsupported. + +> `workaround_bios_bug` (VT-d) + +> Default: `false` + +>> Causes DRHD entries without any PCI discoverable devices under them to be +>> ignored (normally IOMMU setup fails if any of the devices listed by a DRHD +>> entry aren't PCI discoverable). + +> `verbose` + +> Default: `false` + +>> Increase IOMMU code's verbosity. + +> `debug` + +> Default: `false` + +>> Enable IOMMU debugging code (implies `verbose`). + +### iommu\_inclusive\_mapping (VT-d) > `= ` +> Default: `false` + +Use this to work around firmware issues providing correct RMRR entries. Rather +than only mapping RAM pages for IOMMU accesses for Dom0, with this option all +pages not marked as unusable in the E820 table will get a mapping established. + ### irq\_ratelimit > `= ` -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxh-0007iJ-Hv; Mon, 28 Jul 2014 12:23:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxg-0007i7-Bz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:28 +0000 Received: from [85.158.143.35:44309] by server-3.bemta-4.messagelabs.com id F5/3C-06192-FB046D35; Mon, 28 Jul 2014 12:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550206!11888341!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5227 invoked from network); 28 Jul 2014 12:23:26 -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; 28 Jul 2014 12:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxd-0001Ea-Sj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxd-0000gy-RC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:25 +0000 Date: Mon, 28 Jul 2014 12:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] document IOMMU related command line 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 d193507d3ef208aca4807d386add3aa4c598fde7 Author: Jan Beulich AuthorDate: Thu Jul 24 08:58:10 2014 +0200 Commit: Jan Beulich CommitDate: Thu Jul 24 08:58:10 2014 +0200 document IOMMU related command line options Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 94 ++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 1 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 94f04bd..3ff02bd 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -659,9 +659,101 @@ debug hypervisor only). ### ioapic\_ack ### iommu -### iommu\_inclusive\_mapping +> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` + +> Sub-options: + +> `` + +> Default: `on` + +>> Control the use of IOMMU(s) in the system. + +> All other sub-options are of boolean kind and can be prefixed with `no-` to +> effect the inverse meaning. + +> `force` or `required` + +> Default: `false` + +>> Don't continue booting unless IOMMU support is found and can be initialized +>> successfully. + +> `intremap` + +> Default: `true` + +>> Control the use of interrupt remapping (DMA remapping will always be enabled +>> if IOMMU functionality is enabled). + +> `qinval` (VT-d) + +> Default: `true` + +>> Control the use of Queued Invalidation. + +> `snoop` (Intel) + +> Default: `true` + +>> Control the use of Snoop Control. + +> `sharept` + +> Default: `true` + +>> Control whether CPU and IOMMU page tables should be shared. + +> `dom0-passthrough` + +> Default: `false` + +>> Control whether to disable DMA remapping for Dom0. + +> `dom0-strict` + +> Default: `false` + +>> Control whether to set up DMA remapping only for the memory Dom0 actually +>> got assigned. Implies `no-dom0-passthrough`. + +> `amd-iommu-perdev-intremap` + +> Default: `true` + +>> Control whether to set up interrupt remapping data structures per device +>> rather that once for the entire system. Turning this off is making PCI +>> device pass-through insecure and hence unsupported. + +> `workaround_bios_bug` (VT-d) + +> Default: `false` + +>> Causes DRHD entries without any PCI discoverable devices under them to be +>> ignored (normally IOMMU setup fails if any of the devices listed by a DRHD +>> entry aren't PCI discoverable). + +> `verbose` + +> Default: `false` + +>> Increase IOMMU code's verbosity. + +> `debug` + +> Default: `false` + +>> Enable IOMMU debugging code (implies `verbose`). + +### iommu\_inclusive\_mapping (VT-d) > `= ` +> Default: `false` + +Use this to work around firmware issues providing correct RMRR entries. Rather +than only mapping RAM pages for IOMMU accesses for Dom0, with this option all +pages not marked as unusable in the E820 table will get a mapping established. + ### irq\_ratelimit > `= ` -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxr-0007js-Kc; Mon, 28 Jul 2014 12:23:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxq-0007jb-Dz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:38 +0000 Received: from [193.109.254.147:44187] by server-10.bemta-14.messagelabs.com id 5D/0F-06615-9C046D35; Mon, 28 Jul 2014 12:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406550216!12228992!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31736 invoked from network); 28 Jul 2014 12:23:37 -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; 28 Jul 2014 12:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxo-0001FA-2D for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxo-0000hb-0c for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:36 +0000 Date: Mon, 28 Jul 2014 12:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: disable valgrind integration when building for minios X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 100546c0d2045943b721da9edac312397a87f761 Author: Ian Campbell AuthorDate: Mon Jul 21 12:29:14 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:04 2014 +0100 libxc: disable valgrind integration when building for minios The stubdom build system incorrectly picks up on the hosts installation of Valgrind, which cannot work in a stubdom environment. Signed-off-by: Ian Campbell Tested-by: Simon Martin Reviewed-by: Andrew Cooper Acked-by: Samuel Thibault [ ijc -- s/define/defined/ ] --- tools/libxc/xc_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index ce7e81e..c50a7c9 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -34,7 +34,7 @@ #include -#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) +#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) && !defined(__MINIOS__) /* Compile in Valgrind client requests? */ #include #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 Mon Jul 28 12:23:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjxr-0007js-Kc; Mon, 28 Jul 2014 12:23:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxq-0007jb-Dz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:38 +0000 Received: from [193.109.254.147:44187] by server-10.bemta-14.messagelabs.com id 5D/0F-06615-9C046D35; Mon, 28 Jul 2014 12:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406550216!12228992!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31736 invoked from network); 28 Jul 2014 12:23:37 -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; 28 Jul 2014 12:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxo-0001FA-2D for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxo-0000hb-0c for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:36 +0000 Date: Mon, 28 Jul 2014 12:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: disable valgrind integration when building for minios X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 100546c0d2045943b721da9edac312397a87f761 Author: Ian Campbell AuthorDate: Mon Jul 21 12:29:14 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:04 2014 +0100 libxc: disable valgrind integration when building for minios The stubdom build system incorrectly picks up on the hosts installation of Valgrind, which cannot work in a stubdom environment. Signed-off-by: Ian Campbell Tested-by: Simon Martin Reviewed-by: Andrew Cooper Acked-by: Samuel Thibault [ ijc -- s/define/defined/ ] --- tools/libxc/xc_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index ce7e81e..c50a7c9 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -34,7 +34,7 @@ #include -#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) +#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) && !defined(__MINIOS__) /* Compile in Valgrind client requests? */ #include #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 Mon Jul 28 12:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjy2-0007la-Np; Mon, 28 Jul 2014 12:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjy1-0007lG-25 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:49 +0000 Received: from [85.158.137.68:8614] by server-16.bemta-3.messagelabs.com id 3A/44-14115-4D046D35; Mon, 28 Jul 2014 12:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1406550226!18385281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13492 invoked from network); 28 Jul 2014 12:23:47 -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; 28 Jul 2014 12:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxy-0001FG-8e for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxy-0000i3-7Z for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:46 +0000 Date: Mon, 28 Jul 2014 12:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct whitespace/comments and use #defines in head.S X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e1776751ad1c6cdf8803be686f197526e1b5486 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:55 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:16 2014 +0100 xen: arm: correct whitespace/comments and use #defines in head.S Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 11 +++++------ xen/arch/arm/arm64/head.S | 15 +++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 73b97cb..51501dc 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -266,10 +266,10 @@ cpu_init_done: strd r2, r3, [r4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ - lsrs r1, r9, #30 /* Offset of base paddr in boot_pgtable */ + lsrs r1, r9, #FIRST_SHIFT /* Offset of base paddr in boot_pgtable */ beq 1f /* If it is in slot 0 then map in boot_second * later on */ - lsl r2, r1, #30 /* Base address for 1GB mapping */ + lsl r2, r1, #FIRST_SHIFT /* Base address for 1GB mapping */ orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) lsl r1, r1, #3 /* r1 := Slot offset */ @@ -277,7 +277,7 @@ cpu_init_done: 1: /* Setup boot_second: */ ldr r4, =boot_second - add r4, r4, r10 /* r1 := paddr (boot_second) */ + add r4, r4, r10 /* r4 := paddr (boot_second) */ lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ lsl r2, r2, #SECOND_SHIFT @@ -320,7 +320,7 @@ paging: dsb #if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just - * the mapping from boot_second to xen_fixmap */ + * the mapping from boot_second to xen_fixmap */ teq r12, #0 bne 1f @@ -408,8 +408,7 @@ launch: beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ -/* Fail-stop - * r0: string explaining why */ +/* Fail-stop */ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 7d53143..d46481b 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -267,11 +267,11 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ - lsr x1, x19, #39 /* Offset of base paddr in boot_pgtable */ + lsr x1, x19, #ZEROETH_SHIFT/* Offset of base paddr in boot_pgtable */ cbz x1, 1f /* It's in slot 0, map in boot_first * or boot_second later on */ - lsl x2, x1, #39 /* Base address for 512GB mapping */ + lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ mov x3, #PT_MEM /* x2 := Section mapping */ orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ @@ -284,7 +284,7 @@ skip_bss: /* ... map boot_second in boot_first[0] */ ldr x1, =boot_second add x1, x1, x20 /* x1 := paddr(boot_second) */ - mov x3, #PT_PT /* x2 := table map of boot_first */ + mov x3, #PT_PT /* x2 := table map of boot_second */ orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ @@ -300,8 +300,8 @@ skip_bss: str x2, [x4, x1] /* Create mapping of paddr(start)*/ 1: /* Setup boot_second: */ - ldr x4, =boot_second - add x4, x4, x20 /* x4 := paddr (boot_second) */ + ldr x4, =boot_second /* Next level into boot_second */ + add x4, x4, x20 /* x4 := paddr(boot_second) */ lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ lsl x2, x2, #SECOND_SHIFT @@ -345,7 +345,7 @@ paging: dsb sy #if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just - * the mapping from boot_second to xen_fixmap */ + * the mapping from boot_second to xen_fixmap */ cbnz x22, 1f /* Add UART to the fixmap table */ @@ -428,8 +428,7 @@ launch: cbz x22, start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ -/* Fail-stop - * r0: string explaining why */ +/* Fail-stop */ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:23: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 1XBjy2-0007la-Np; Mon, 28 Jul 2014 12:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjy1-0007lG-25 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:49 +0000 Received: from [85.158.137.68:8614] by server-16.bemta-3.messagelabs.com id 3A/44-14115-4D046D35; Mon, 28 Jul 2014 12:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1406550226!18385281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13492 invoked from network); 28 Jul 2014 12:23:47 -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; 28 Jul 2014 12:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjxy-0001FG-8e for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjxy-0000i3-7Z for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:46 +0000 Date: Mon, 28 Jul 2014 12:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct whitespace/comments and use #defines in head.S X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e1776751ad1c6cdf8803be686f197526e1b5486 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:55 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:16 2014 +0100 xen: arm: correct whitespace/comments and use #defines in head.S Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 11 +++++------ xen/arch/arm/arm64/head.S | 15 +++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 73b97cb..51501dc 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -266,10 +266,10 @@ cpu_init_done: strd r2, r3, [r4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ - lsrs r1, r9, #30 /* Offset of base paddr in boot_pgtable */ + lsrs r1, r9, #FIRST_SHIFT /* Offset of base paddr in boot_pgtable */ beq 1f /* If it is in slot 0 then map in boot_second * later on */ - lsl r2, r1, #30 /* Base address for 1GB mapping */ + lsl r2, r1, #FIRST_SHIFT /* Base address for 1GB mapping */ orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) lsl r1, r1, #3 /* r1 := Slot offset */ @@ -277,7 +277,7 @@ cpu_init_done: 1: /* Setup boot_second: */ ldr r4, =boot_second - add r4, r4, r10 /* r1 := paddr (boot_second) */ + add r4, r4, r10 /* r4 := paddr (boot_second) */ lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ lsl r2, r2, #SECOND_SHIFT @@ -320,7 +320,7 @@ paging: dsb #if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just - * the mapping from boot_second to xen_fixmap */ + * the mapping from boot_second to xen_fixmap */ teq r12, #0 bne 1f @@ -408,8 +408,7 @@ launch: beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ -/* Fail-stop - * r0: string explaining why */ +/* Fail-stop */ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 7d53143..d46481b 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -267,11 +267,11 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ - lsr x1, x19, #39 /* Offset of base paddr in boot_pgtable */ + lsr x1, x19, #ZEROETH_SHIFT/* Offset of base paddr in boot_pgtable */ cbz x1, 1f /* It's in slot 0, map in boot_first * or boot_second later on */ - lsl x2, x1, #39 /* Base address for 512GB mapping */ + lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ mov x3, #PT_MEM /* x2 := Section mapping */ orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ @@ -284,7 +284,7 @@ skip_bss: /* ... map boot_second in boot_first[0] */ ldr x1, =boot_second add x1, x1, x20 /* x1 := paddr(boot_second) */ - mov x3, #PT_PT /* x2 := table map of boot_first */ + mov x3, #PT_PT /* x2 := table map of boot_second */ orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ @@ -300,8 +300,8 @@ skip_bss: str x2, [x4, x1] /* Create mapping of paddr(start)*/ 1: /* Setup boot_second: */ - ldr x4, =boot_second - add x4, x4, x20 /* x4 := paddr (boot_second) */ + ldr x4, =boot_second /* Next level into boot_second */ + add x4, x4, x20 /* x4 := paddr(boot_second) */ lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ lsl x2, x2, #SECOND_SHIFT @@ -345,7 +345,7 @@ paging: dsb sy #if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just - * the mapping from boot_second to xen_fixmap */ + * the mapping from boot_second to xen_fixmap */ cbnz x22, 1f /* Add UART to the fixmap table */ @@ -428,8 +428,7 @@ launch: cbz x22, start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ -/* Fail-stop - * r0: string explaining why */ +/* Fail-stop */ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyC-0007mz-Sj; Mon, 28 Jul 2014 12:24:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyB-0007mk-R2 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:00 +0000 Received: from [85.158.137.68:18077] by server-9.bemta-3.messagelabs.com id B6/37-30790-FD046D35; Mon, 28 Jul 2014 12:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1406550236!18385334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15628 invoked from network); 28 Jul 2014 12:23:57 -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; 28 Jul 2014 12:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjy8-0001FQ-G8 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjy8-0000iV-E3 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:56 +0000 Date: Mon, 28 Jul 2014 12:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Handle 4K aligned hypervisor load 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 ca59618967fe0c3ecc6cb7bd8bd0f5651b4e9dea Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:56 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Handle 4K aligned hypervisor load address. Currently the boot page tables map Xen at XEN_VIRT_START using a 2MB section mapping. This means that the bootloader must load Xen at a 2MB aligned address. Unfortunately this is not the case with UEFI on the Juno platform where Xen fails to boot. Furthermore the Linux boot protocol (which Xen claims to adhere to) does not have this restriction, therefore this is our bug and not the bootloader's. Fix this by adding third level pagetables to the boot time pagetables, allowing us to map a Xen which is aligned only to a 4K boundary. This only affects the boot time page tables since Xen will later relocate itself to a 2MB aligned address. Strictly speaking the non-boot processors could make use of this and use a section mapping, but it is simpler if all processors follow the same boot path. Strictly speaking the Linux boot protocol doesn't even require 4K alignment (and apparently Linux can cope with this), but so far all bootloaders appear to provide it, so support for this is left for another day. In order to use LPAE_ENTRIES in head.S we need to define it in an asm friendly way. Signed-off-by: Ian Campbell Acked-by: Julien Grall [ ijc -- properly format message "- FOO -\r\n" ] --- xen/arch/arm/arm32/head.S | 62 ++++++++++++++++++++++++++++++++----------- xen/arch/arm/arm64/head.S | 62 +++++++++++++++++++++++++++++++------------ xen/arch/arm/mm.c | 8 ++++- xen/include/asm-arm/page.h | 2 +- 4 files changed, 97 insertions(+), 37 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 51501dc..a6ee342 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -26,6 +26,7 @@ #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_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 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 */ @@ -73,7 +74,7 @@ /* This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 2MB-aligned address. All of text+data+bss must fit in 2MB, + * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ .global start start: @@ -258,11 +259,11 @@ cpu_init_done: /* Setup boot_pgtable: */ ldr r1, =boot_second add r1, r1, r10 /* r1 := paddr (boot_second) */ - mov r3, #0x0 /* ... map boot_second in boot_pgtable[0] */ orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_second */ orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ + mov r3, #0x0 strd r2, r3, [r4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ @@ -279,31 +280,60 @@ cpu_init_done: ldr r4, =boot_second add r4, r4, r10 /* r4 := paddr (boot_second) */ - lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ - lsl r2, r2, #SECOND_SHIFT + ldr r1, =boot_third + add r1, r1, r10 /* r1 := paddr (boot_third) */ + + /* ... map boot_third in boot_second[1] */ + orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_third */ + orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ + mov r3, #0x0 + strd r2, r3, [r4, #8] /* Map it in slot 1 */ + + /* ... map of paddr(start) in boot_second */ + lsr r2, r9, #SECOND_SHIFT /* Offset of base paddr in boot_second */ + ldr r3, =LPAE_ENTRY_MASK + and r1, r2, r3 + cmp r1, #1 + beq virtphys_clash /* It's in slot 1, which we cannot handle */ + + lsl r2, r2, #SECOND_SHIFT /* Base address for 2MB mapping */ orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) + mov r3, #0x0 + lsl r1, r1, #3 /* r1 := Slot offset */ + strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ - /* ... map of vaddr(start) in boot_second */ - ldr r1, =start - lsr r1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ - strd r2, r3, [r4, r1] /* Map vaddr(start) */ + /* Setup boot_third: */ +1: ldr r4, =boot_third + add r4, r4, r10 /* r4 := paddr (boot_third) */ - /* ... map of paddr(start) in boot_second */ - lsrs r1, r9, #30 /* Base paddr */ - bne 1f /* If paddr(start) is not in slot 0 - * then the mapping was done in - * boot_pgtable above */ + lsr r2, r9, #THIRD_SHIFT /* Base address for 4K mapping */ + lsl r2, r2, #THIRD_SHIFT + orr r2, r2, #PT_UPPER(MEM_L3) /* r2:r3 := map */ + orr r2, r2, #PT_LOWER(MEM_L3) + mov r3, #0x0 - mov r1, r9, lsr #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ - strd r2, r3, [r4, r1] /* Map Xen there */ -1: + /* ... map of vaddr(start) in boot_third */ + mov r1, #0 +1: strd r2, r3, [r4, r1] /* Map vaddr(start) */ + add r2, r2, #PAGE_SIZE /* Next page */ + add r1, r1, #8 /* Next slot */ + cmp r1, #(LPAE_ENTRIES<<3) /* 512*8-byte entries per page */ + blo 1b /* Defer fixmap and dtb mapping until after paging enabled, to * avoid them clashing with the 1:1 mapping. */ /* boot pagetable setup complete */ + b 1f + +virtphys_clash: + /* Identity map clashes with boot_third, which we cannot handle yet */ + PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") + b fail + +1: PRINT("- Turning on paging -\r\n") ldr r1, =paging /* Explicit vaddr, not RIP-relative */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index d46481b..248f461 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -27,6 +27,7 @@ #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_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 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 */ @@ -95,7 +96,7 @@ * * This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 2MB-aligned address. All of text+data+bss must fit in 2MB, + * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ @@ -274,8 +275,9 @@ skip_bss: lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ mov x3, #PT_MEM /* x2 := Section mapping */ orr x2, x2, x3 - lsl x1, x1, #3 /* x1 := Slot offset */ - str x2, [x4, x1] /* Mapping of paddr(start)*/ + and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ + lsl x1, x1, #3 + str x2, [x4, x1] /* Mapping of paddr(start) */ 1: /* Setup boot_first: */ ldr x4, =boot_first /* Next level into boot_first */ @@ -290,7 +292,7 @@ skip_bss: /* ... map of paddr(start) in boot_first */ lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ - and x1, x2, 0x1ff /* x1 := Slot to use */ + and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ lsl x2, x2, #FIRST_SHIFT /* Base address for 1GB mapping */ @@ -303,31 +305,55 @@ skip_bss: ldr x4, =boot_second /* Next level into boot_second */ add x4, x4, x20 /* x4 := paddr(boot_second) */ - lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ - lsl x2, x2, #SECOND_SHIFT + /* ... map boot_third in boot_second[1] */ + ldr x1, =boot_third + add x1, x1, x20 /* x1 := paddr(boot_third) */ + mov x3, #PT_PT /* x2 := table map of boot_third */ + orr x2, x1, x3 /* + rights for linear PT */ + str x2, [x4, #8] /* Map it in slot 1 */ + + /* ... map of paddr(start) in boot_second */ + lsr x2, x19, #SECOND_SHIFT /* x2 := Offset of base paddr in boot_second */ + and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ + cmp x1, #1 + b.eq virtphys_clash /* It's in slot 1, which we cannot handle */ + + lsl x2, x2, #SECOND_SHIFT /* Base address for 2MB mapping */ mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Create mapping of paddr(start)*/ - /* ... map of vaddr(start) in boot_second */ - ldr x1, =start - lsr x1, x1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ - str x2, [x4, x1] /* Map vaddr(start) */ +1: /* Setup boot_third: */ + ldr x4, =boot_third + add x4, x4, x20 /* x4 := paddr (boot_third) */ - /* ... map of paddr(start) in boot_second */ - 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 x2, x19, #THIRD_SHIFT /* Base address for 4K mapping */ + lsl x2, x2, #THIRD_SHIFT + mov x3, #PT_MEM_L3 /* x2 := Section map */ + orr x2, x2, x3 - lsr x1, x19, #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ - str x2, [x4, x1] /* Map Xen there */ -1: + /* ... map of vaddr(start) in boot_third */ + mov x1, xzr +1: str x2, [x4, x1] /* Map vaddr(start) */ + add x2, x2, #PAGE_SIZE /* Next page */ + add x1, x1, #8 /* Next slot */ + cmp x1, #(LPAE_ENTRIES<<3) /* 512 entries per page */ + b.lt 1b /* Defer fixmap and dtb mapping until after paging enabled, to * avoid them clashing with the 1:1 mapping. */ /* boot pagetable setup complete */ + b 1f + +virtphys_clash: + /* Identity map clashes with boot_third, which we cannot handle yet */ + PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") + b fail + +1: PRINT("- Turning on paging -\r\n") ldr x1, =paging /* Explicit vaddr, not RIP-relative */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 03a0533..fdc7c98 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -47,8 +47,9 @@ struct domain *dom_xen, *dom_io, *dom_cow; * to the CPUs own pagetables. * * These pagetables have a very simple structure. They include: - * - a 2MB mapping of xen at XEN_VIRT_START, boot_first and - * boot_second are used to populate the trie down to that mapping. + * - 2MB worth of 4K mappings of xen at XEN_VIRT_START, boot_first and + * boot_second are used to populate the tables down to boot_third + * which contains the actual mapping. * - a 1:1 mapping of xen at its current physical address. This uses a * section mapping at whichever of boot_{pgtable,first,second} * covers that physical address. @@ -69,6 +70,7 @@ lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #endif lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* Main runtime page tables */ @@ -492,6 +494,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #endif memset(boot_second, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_second); + memset(boot_third, 0x0, PAGE_SIZE); + clean_and_invalidate_xen_dcache(boot_third); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 113be5a..739038a 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -396,7 +396,7 @@ static inline int gva_to_ipa(vaddr_t va, paddr_t *paddr) */ #define LPAE_SHIFT 9 -#define LPAE_ENTRIES (1u << LPAE_SHIFT) +#define LPAE_ENTRIES (_AC(1,U) << LPAE_SHIFT) #define LPAE_ENTRY_MASK (LPAE_ENTRIES - 1) #define THIRD_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 Mon Jul 28 12:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyC-0007mz-Sj; Mon, 28 Jul 2014 12:24:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyB-0007mk-R2 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:00 +0000 Received: from [85.158.137.68:18077] by server-9.bemta-3.messagelabs.com id B6/37-30790-FD046D35; Mon, 28 Jul 2014 12:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1406550236!18385334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15628 invoked from network); 28 Jul 2014 12:23:57 -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; 28 Jul 2014 12:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjy8-0001FQ-G8 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjy8-0000iV-E3 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:23:56 +0000 Date: Mon, 28 Jul 2014 12:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Handle 4K aligned hypervisor load 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 ca59618967fe0c3ecc6cb7bd8bd0f5651b4e9dea Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:56 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Handle 4K aligned hypervisor load address. Currently the boot page tables map Xen at XEN_VIRT_START using a 2MB section mapping. This means that the bootloader must load Xen at a 2MB aligned address. Unfortunately this is not the case with UEFI on the Juno platform where Xen fails to boot. Furthermore the Linux boot protocol (which Xen claims to adhere to) does not have this restriction, therefore this is our bug and not the bootloader's. Fix this by adding third level pagetables to the boot time pagetables, allowing us to map a Xen which is aligned only to a 4K boundary. This only affects the boot time page tables since Xen will later relocate itself to a 2MB aligned address. Strictly speaking the non-boot processors could make use of this and use a section mapping, but it is simpler if all processors follow the same boot path. Strictly speaking the Linux boot protocol doesn't even require 4K alignment (and apparently Linux can cope with this), but so far all bootloaders appear to provide it, so support for this is left for another day. In order to use LPAE_ENTRIES in head.S we need to define it in an asm friendly way. Signed-off-by: Ian Campbell Acked-by: Julien Grall [ ijc -- properly format message "- FOO -\r\n" ] --- xen/arch/arm/arm32/head.S | 62 ++++++++++++++++++++++++++++++++----------- xen/arch/arm/arm64/head.S | 62 +++++++++++++++++++++++++++++++------------ xen/arch/arm/mm.c | 8 ++++- xen/include/asm-arm/page.h | 2 +- 4 files changed, 97 insertions(+), 37 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 51501dc..a6ee342 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -26,6 +26,7 @@ #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_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 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 */ @@ -73,7 +74,7 @@ /* This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 2MB-aligned address. All of text+data+bss must fit in 2MB, + * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ .global start start: @@ -258,11 +259,11 @@ cpu_init_done: /* Setup boot_pgtable: */ ldr r1, =boot_second add r1, r1, r10 /* r1 := paddr (boot_second) */ - mov r3, #0x0 /* ... map boot_second in boot_pgtable[0] */ orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_second */ orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ + mov r3, #0x0 strd r2, r3, [r4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_pgtable */ @@ -279,31 +280,60 @@ cpu_init_done: ldr r4, =boot_second add r4, r4, r10 /* r4 := paddr (boot_second) */ - lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ - lsl r2, r2, #SECOND_SHIFT + ldr r1, =boot_third + add r1, r1, r10 /* r1 := paddr (boot_third) */ + + /* ... map boot_third in boot_second[1] */ + orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_third */ + orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ + mov r3, #0x0 + strd r2, r3, [r4, #8] /* Map it in slot 1 */ + + /* ... map of paddr(start) in boot_second */ + lsr r2, r9, #SECOND_SHIFT /* Offset of base paddr in boot_second */ + ldr r3, =LPAE_ENTRY_MASK + and r1, r2, r3 + cmp r1, #1 + beq virtphys_clash /* It's in slot 1, which we cannot handle */ + + lsl r2, r2, #SECOND_SHIFT /* Base address for 2MB mapping */ orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) + mov r3, #0x0 + lsl r1, r1, #3 /* r1 := Slot offset */ + strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ - /* ... map of vaddr(start) in boot_second */ - ldr r1, =start - lsr r1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ - strd r2, r3, [r4, r1] /* Map vaddr(start) */ + /* Setup boot_third: */ +1: ldr r4, =boot_third + add r4, r4, r10 /* r4 := paddr (boot_third) */ - /* ... map of paddr(start) in boot_second */ - lsrs r1, r9, #30 /* Base paddr */ - bne 1f /* If paddr(start) is not in slot 0 - * then the mapping was done in - * boot_pgtable above */ + lsr r2, r9, #THIRD_SHIFT /* Base address for 4K mapping */ + lsl r2, r2, #THIRD_SHIFT + orr r2, r2, #PT_UPPER(MEM_L3) /* r2:r3 := map */ + orr r2, r2, #PT_LOWER(MEM_L3) + mov r3, #0x0 - mov r1, r9, lsr #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ - strd r2, r3, [r4, r1] /* Map Xen there */ -1: + /* ... map of vaddr(start) in boot_third */ + mov r1, #0 +1: strd r2, r3, [r4, r1] /* Map vaddr(start) */ + add r2, r2, #PAGE_SIZE /* Next page */ + add r1, r1, #8 /* Next slot */ + cmp r1, #(LPAE_ENTRIES<<3) /* 512*8-byte entries per page */ + blo 1b /* Defer fixmap and dtb mapping until after paging enabled, to * avoid them clashing with the 1:1 mapping. */ /* boot pagetable setup complete */ + b 1f + +virtphys_clash: + /* Identity map clashes with boot_third, which we cannot handle yet */ + PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") + b fail + +1: PRINT("- Turning on paging -\r\n") ldr r1, =paging /* Explicit vaddr, not RIP-relative */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index d46481b..248f461 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -27,6 +27,7 @@ #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_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 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 */ @@ -95,7 +96,7 @@ * * This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 2MB-aligned address. All of text+data+bss must fit in 2MB, + * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ @@ -274,8 +275,9 @@ skip_bss: lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ mov x3, #PT_MEM /* x2 := Section mapping */ orr x2, x2, x3 - lsl x1, x1, #3 /* x1 := Slot offset */ - str x2, [x4, x1] /* Mapping of paddr(start)*/ + and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ + lsl x1, x1, #3 + str x2, [x4, x1] /* Mapping of paddr(start) */ 1: /* Setup boot_first: */ ldr x4, =boot_first /* Next level into boot_first */ @@ -290,7 +292,7 @@ skip_bss: /* ... map of paddr(start) in boot_first */ lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ - and x1, x2, 0x1ff /* x1 := Slot to use */ + and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ lsl x2, x2, #FIRST_SHIFT /* Base address for 1GB mapping */ @@ -303,31 +305,55 @@ skip_bss: ldr x4, =boot_second /* Next level into boot_second */ add x4, x4, x20 /* x4 := paddr(boot_second) */ - lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ - lsl x2, x2, #SECOND_SHIFT + /* ... map boot_third in boot_second[1] */ + ldr x1, =boot_third + add x1, x1, x20 /* x1 := paddr(boot_third) */ + mov x3, #PT_PT /* x2 := table map of boot_third */ + orr x2, x1, x3 /* + rights for linear PT */ + str x2, [x4, #8] /* Map it in slot 1 */ + + /* ... map of paddr(start) in boot_second */ + lsr x2, x19, #SECOND_SHIFT /* x2 := Offset of base paddr in boot_second */ + and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ + cmp x1, #1 + b.eq virtphys_clash /* It's in slot 1, which we cannot handle */ + + lsl x2, x2, #SECOND_SHIFT /* Base address for 2MB mapping */ mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Create mapping of paddr(start)*/ - /* ... map of vaddr(start) in boot_second */ - ldr x1, =start - lsr x1, x1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ - str x2, [x4, x1] /* Map vaddr(start) */ +1: /* Setup boot_third: */ + ldr x4, =boot_third + add x4, x4, x20 /* x4 := paddr (boot_third) */ - /* ... map of paddr(start) in boot_second */ - 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 x2, x19, #THIRD_SHIFT /* Base address for 4K mapping */ + lsl x2, x2, #THIRD_SHIFT + mov x3, #PT_MEM_L3 /* x2 := Section map */ + orr x2, x2, x3 - lsr x1, x19, #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ - str x2, [x4, x1] /* Map Xen there */ -1: + /* ... map of vaddr(start) in boot_third */ + mov x1, xzr +1: str x2, [x4, x1] /* Map vaddr(start) */ + add x2, x2, #PAGE_SIZE /* Next page */ + add x1, x1, #8 /* Next slot */ + cmp x1, #(LPAE_ENTRIES<<3) /* 512 entries per page */ + b.lt 1b /* Defer fixmap and dtb mapping until after paging enabled, to * avoid them clashing with the 1:1 mapping. */ /* boot pagetable setup complete */ + b 1f + +virtphys_clash: + /* Identity map clashes with boot_third, which we cannot handle yet */ + PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") + b fail + +1: PRINT("- Turning on paging -\r\n") ldr x1, =paging /* Explicit vaddr, not RIP-relative */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 03a0533..fdc7c98 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -47,8 +47,9 @@ struct domain *dom_xen, *dom_io, *dom_cow; * to the CPUs own pagetables. * * These pagetables have a very simple structure. They include: - * - a 2MB mapping of xen at XEN_VIRT_START, boot_first and - * boot_second are used to populate the trie down to that mapping. + * - 2MB worth of 4K mappings of xen at XEN_VIRT_START, boot_first and + * boot_second are used to populate the tables down to boot_third + * which contains the actual mapping. * - a 1:1 mapping of xen at its current physical address. This uses a * section mapping at whichever of boot_{pgtable,first,second} * covers that physical address. @@ -69,6 +70,7 @@ lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #endif lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* Main runtime page tables */ @@ -492,6 +494,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #endif memset(boot_second, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_second); + memset(boot_third, 0x0, PAGE_SIZE); + clean_and_invalidate_xen_dcache(boot_third); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 113be5a..739038a 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -396,7 +396,7 @@ static inline int gva_to_ipa(vaddr_t va, paddr_t *paddr) */ #define LPAE_SHIFT 9 -#define LPAE_ENTRIES (1u << LPAE_SHIFT) +#define LPAE_ENTRIES (_AC(1,U) << LPAE_SHIFT) #define LPAE_ENTRY_MASK (LPAE_ENTRIES - 1) #define THIRD_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 Mon Jul 28 12:24:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyO-0007ov-VX; Mon, 28 Jul 2014 12:24:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyN-0007ob-Ow for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:11 +0000 Received: from [85.158.143.35:52731] by server-3.bemta-4.messagelabs.com id 23/3D-06192-BE046D35; Mon, 28 Jul 2014 12:24:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1406550246!4614646!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2737 invoked from network); 28 Jul 2014 12:24:07 -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; 28 Jul 2014 12:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyI-0001Fy-NA for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyI-0000j8-KV for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:06 +0000 Date: Mon, 28 Jul 2014 12:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Do not use level 0 section mappings in boot page tables. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7deffc611a1a643d5a1c86ecd4bbf076414eb96 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:57 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Do not use level 0 section mappings in boot page tables. Level 0 does not support superpage mappings, meaning that systems on where Xen is loaded above 512GB (I'm not aware of any such systems) the 1:1 mapping on the boot page tables is invalid. In order to avoid this issue we need an additional first level page table mapped by the appropriate L0 slot and containing a 1:1 superpage mapping. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/head.S | 21 ++++++++++++++++++--- xen/arch/arm/mm.c | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 248f461..99eb0a6 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -267,13 +267,28 @@ skip_bss: orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ - /* ... map of paddr(start) in boot_pgtable */ + /* ... map of paddr(start) in boot_pgtable+boot_first_id */ lsr x1, x19, #ZEROETH_SHIFT/* Offset of base paddr in boot_pgtable */ cbz x1, 1f /* It's in slot 0, map in boot_first * or boot_second later on */ - lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ - mov x3, #PT_MEM /* x2 := Section mapping */ + /* Level zero does not support superpage mappings, so we have + * to use an extra first level page in which we create a 1GB mapping. + */ + ldr x2, =boot_first_id + add x2, x2, x20 /* x2 := paddr (boot_first_id) */ + + mov x3, #PT_PT /* x2 := table map of boot_first_id */ + orr x2, x2, x3 /* + rights for linear PT */ + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] + + ldr x4, =boot_first_id /* Next level into boot_first_id */ + add x4, x4, x20 /* x4 := paddr(boot_first_id) */ + + lsr x1, x19, #FIRST_SHIFT /* x1 := Offset of base paddr in boot_first_id */ + lsl x2, x1, #FIRST_SHIFT /* x2 := Base address for 1GB mapping */ + mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ lsl x1, x1, #3 diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index fdc7c98..0a243b0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -68,6 +68,7 @@ struct domain *dom_xen, *dom_io, *dom_cow; lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #ifdef CONFIG_ARM_64 lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t boot_first_id[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #endif lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); @@ -491,6 +492,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_first); + memset(boot_first_id, 0x0, PAGE_SIZE); + clean_and_invalidate_xen_dcache(boot_first_id); #endif memset(boot_second, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_second); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyO-0007ov-VX; Mon, 28 Jul 2014 12:24:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyN-0007ob-Ow for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:11 +0000 Received: from [85.158.143.35:52731] by server-3.bemta-4.messagelabs.com id 23/3D-06192-BE046D35; Mon, 28 Jul 2014 12:24:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1406550246!4614646!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2737 invoked from network); 28 Jul 2014 12:24:07 -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; 28 Jul 2014 12:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyI-0001Fy-NA for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyI-0000j8-KV for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:06 +0000 Date: Mon, 28 Jul 2014 12:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Do not use level 0 section mappings in boot page tables. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7deffc611a1a643d5a1c86ecd4bbf076414eb96 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:57 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Do not use level 0 section mappings in boot page tables. Level 0 does not support superpage mappings, meaning that systems on where Xen is loaded above 512GB (I'm not aware of any such systems) the 1:1 mapping on the boot page tables is invalid. In order to avoid this issue we need an additional first level page table mapped by the appropriate L0 slot and containing a 1:1 superpage mapping. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/head.S | 21 ++++++++++++++++++--- xen/arch/arm/mm.c | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 248f461..99eb0a6 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -267,13 +267,28 @@ skip_bss: orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ - /* ... map of paddr(start) in boot_pgtable */ + /* ... map of paddr(start) in boot_pgtable+boot_first_id */ lsr x1, x19, #ZEROETH_SHIFT/* Offset of base paddr in boot_pgtable */ cbz x1, 1f /* It's in slot 0, map in boot_first * or boot_second later on */ - lsl x2, x1, #ZEROETH_SHIFT /* Base address for 512GB mapping */ - mov x3, #PT_MEM /* x2 := Section mapping */ + /* Level zero does not support superpage mappings, so we have + * to use an extra first level page in which we create a 1GB mapping. + */ + ldr x2, =boot_first_id + add x2, x2, x20 /* x2 := paddr (boot_first_id) */ + + mov x3, #PT_PT /* x2 := table map of boot_first_id */ + orr x2, x2, x3 /* + rights for linear PT */ + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] + + ldr x4, =boot_first_id /* Next level into boot_first_id */ + add x4, x4, x20 /* x4 := paddr(boot_first_id) */ + + lsr x1, x19, #FIRST_SHIFT /* x1 := Offset of base paddr in boot_first_id */ + lsl x2, x1, #FIRST_SHIFT /* x2 := Base address for 1GB mapping */ + mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ lsl x1, x1, #3 diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index fdc7c98..0a243b0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -68,6 +68,7 @@ struct domain *dom_xen, *dom_io, *dom_cow; lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #ifdef CONFIG_ARM_64 lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t boot_first_id[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #endif lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); @@ -491,6 +492,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_first); + memset(boot_first_id, 0x0, PAGE_SIZE); + clean_and_invalidate_xen_dcache(boot_first_id); #endif memset(boot_second, 0x0, PAGE_SIZE); clean_and_invalidate_xen_dcache(boot_second); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyX-0007qV-2A; Mon, 28 Jul 2014 12:24:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyV-0007qB-Ti for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:20 +0000 Received: from [85.158.137.68:23886] by server-1.bemta-3.messagelabs.com id 51/27-30185-3F046D35; Mon, 28 Jul 2014 12:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1406550257!18440802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24429 invoked from network); 28 Jul 2014 12:24:18 -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; 28 Jul 2014 12:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyS-0001G4-Sm for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyS-0000kJ-R0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:16 +0000 Date: Mon, 28 Jul 2014 12:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid unnecessary additional mappings in boot page tables. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc94f58cbd1ed26c85a92043e5c404c7dc17cc Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:58 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: avoid unnecessary additional mappings in boot page tables. If the identity map is created at one level then avoid creating entries further down the boot page tables, since these will be aliases at strange virtual address. For example consider an arm32 system (for simplicity) with Xen loaded at address 0x40402000. As a virtual address this corresponds to walking offsets 1, 2 and 2 at the first, second and third levels respectively. When creating the identity map we will therefore create a 1GB super mapping at 0x40000000 for the identity map, which is the one we want to use. However when considering the second level we will see the offset 2 and create a 2MB mapping in slot 2 of boot_second. Since boot_second is mapped in slot 0 of boot_first this corresponds to an unwanted mapping from virtual address 0x00400000 to physical address 0x40400000. We still do not handle the case where the load address is within the 2MB range starting just after XEN_VIRT_START. This is not a regression but this patch tries to provide a more useful diagnostic message. We do handle loading at exactly XEN_VIRT_START. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 20 +++++++++++++++++--- xen/arch/arm/arm64/head.S | 19 ++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index a6ee342..0a95b68 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -45,7 +45,7 @@ * r3 - * r4 - * r5 - - * r6 - + * r6 - identity map in place * r7 - CPUID * r8 - DTB address (boot CPU only) * r9 - paddr(start) @@ -250,6 +250,14 @@ cpu_init_done: * mapping. So each CPU must rebuild the page tables here with * the 1:1 in place. */ + /* If Xen is loaded at exactly XEN_VIRT_START then we don't + * need an additional 1:1 mapping, the virtual mapping will + * suffice. + */ + cmp r9, #XEN_VIRT_START + moveq r6, #1 /* r6 := identity map now in place */ + movne r6, #0 /* r6 := identity map not yet in place */ + /* Write Xen's PT's paddr into the HTTBR */ ldr r4, =boot_pgtable add r4, r4, r10 /* r4 := paddr (boot_pagetable) */ @@ -275,6 +283,7 @@ cpu_init_done: orr r2, r2, #PT_LOWER(MEM) lsl r1, r1, #3 /* r1 := Slot offset */ strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + mov r6, #1 /* r6 := identity map now in place */ 1: /* Setup boot_second: */ ldr r4, =boot_second @@ -290,6 +299,8 @@ cpu_init_done: strd r2, r3, [r4, #8] /* Map it in slot 1 */ /* ... map of paddr(start) in boot_second */ + cmp r6, #1 /* r6 is set if already created */ + beq 1f lsr r2, r9, #SECOND_SHIFT /* Offset of base paddr in boot_second */ ldr r3, =LPAE_ENTRY_MASK and r1, r2, r3 @@ -302,6 +313,7 @@ cpu_init_done: mov r3, #0x0 lsl r1, r1, #3 /* r1 := Slot offset */ strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + mov r6, #1 /* r6 := identity map now in place */ /* Setup boot_third: */ 1: ldr r4, =boot_third @@ -326,8 +338,10 @@ cpu_init_done: /* boot pagetable setup complete */ - b 1f - + cmp r6, #1 /* Did we manage to create an identity mapping ? */ + beq 1f + PRINT("Unable to build boot page tables - Failed to identity map Xen.\r\n") + b fail virtphys_clash: /* Identity map clashes with boot_third, which we cannot handle yet */ PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 99eb0a6..4f0ea2d 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -62,7 +62,7 @@ * x22 - is_secondary_cpu * x23 - UART address * x24 - cpuid - * x25 - + * x25 - identity map in place * x26 - * x27 - * x28 - @@ -253,6 +253,13 @@ skip_bss: * mapping. So each CPU must rebuild the page tables here with * the 1:1 in place. */ + /* If Xen is loaded at exactly XEN_VIRT_START then we don't + * need an additional 1:1 mapping, the virtual mapping will + * suffice. + */ + cmp x19, #XEN_VIRT_START + cset x25, eq /* x25 := identity map in place, or not */ + /* Write Xen's PT's paddr into TTBR0_EL2 */ ldr x4, =boot_pgtable add x4, x4, x20 /* x4 := paddr (boot_pagetable) */ @@ -293,6 +300,7 @@ skip_bss: and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ lsl x1, x1, #3 str x2, [x4, x1] /* Mapping of paddr(start) */ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_first: */ ldr x4, =boot_first /* Next level into boot_first */ @@ -306,6 +314,7 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_first */ + cbnz x25, 1f /* x25 is set if already created */ lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ @@ -315,6 +324,7 @@ skip_bss: orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ str x2, [x4, x1] /* Create mapping of paddr(start)*/ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_second: */ ldr x4, =boot_second /* Next level into boot_second */ @@ -328,6 +338,7 @@ skip_bss: str x2, [x4, #8] /* Map it in slot 1 */ /* ... map of paddr(start) in boot_second */ + cbnz x25, 1f /* x25 is set if already created */ lsr x2, x19, #SECOND_SHIFT /* x2 := Offset of base paddr in boot_second */ and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cmp x1, #1 @@ -338,6 +349,7 @@ skip_bss: orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ str x2, [x4, x1] /* Create mapping of paddr(start)*/ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_third: */ ldr x4, =boot_third @@ -361,8 +373,9 @@ skip_bss: /* boot pagetable setup complete */ - b 1f - + cbnz x25, 1f /* Did we manage to create an identity mapping ? */ + PRINT("Unable to build boot page tables - Failed to identity map Xen.\r\n") + b fail virtphys_clash: /* Identity map clashes with boot_third, which we cannot handle yet */ PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyX-0007qV-2A; Mon, 28 Jul 2014 12:24:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyV-0007qB-Ti for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:20 +0000 Received: from [85.158.137.68:23886] by server-1.bemta-3.messagelabs.com id 51/27-30185-3F046D35; Mon, 28 Jul 2014 12:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1406550257!18440802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24429 invoked from network); 28 Jul 2014 12:24:18 -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; 28 Jul 2014 12:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyS-0001G4-Sm for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyS-0000kJ-R0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:16 +0000 Date: Mon, 28 Jul 2014 12:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid unnecessary additional mappings in boot page tables. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc94f58cbd1ed26c85a92043e5c404c7dc17cc Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:58 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: avoid unnecessary additional mappings in boot page tables. If the identity map is created at one level then avoid creating entries further down the boot page tables, since these will be aliases at strange virtual address. For example consider an arm32 system (for simplicity) with Xen loaded at address 0x40402000. As a virtual address this corresponds to walking offsets 1, 2 and 2 at the first, second and third levels respectively. When creating the identity map we will therefore create a 1GB super mapping at 0x40000000 for the identity map, which is the one we want to use. However when considering the second level we will see the offset 2 and create a 2MB mapping in slot 2 of boot_second. Since boot_second is mapped in slot 0 of boot_first this corresponds to an unwanted mapping from virtual address 0x00400000 to physical address 0x40400000. We still do not handle the case where the load address is within the 2MB range starting just after XEN_VIRT_START. This is not a regression but this patch tries to provide a more useful diagnostic message. We do handle loading at exactly XEN_VIRT_START. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 20 +++++++++++++++++--- xen/arch/arm/arm64/head.S | 19 ++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index a6ee342..0a95b68 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -45,7 +45,7 @@ * r3 - * r4 - * r5 - - * r6 - + * r6 - identity map in place * r7 - CPUID * r8 - DTB address (boot CPU only) * r9 - paddr(start) @@ -250,6 +250,14 @@ cpu_init_done: * mapping. So each CPU must rebuild the page tables here with * the 1:1 in place. */ + /* If Xen is loaded at exactly XEN_VIRT_START then we don't + * need an additional 1:1 mapping, the virtual mapping will + * suffice. + */ + cmp r9, #XEN_VIRT_START + moveq r6, #1 /* r6 := identity map now in place */ + movne r6, #0 /* r6 := identity map not yet in place */ + /* Write Xen's PT's paddr into the HTTBR */ ldr r4, =boot_pgtable add r4, r4, r10 /* r4 := paddr (boot_pagetable) */ @@ -275,6 +283,7 @@ cpu_init_done: orr r2, r2, #PT_LOWER(MEM) lsl r1, r1, #3 /* r1 := Slot offset */ strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + mov r6, #1 /* r6 := identity map now in place */ 1: /* Setup boot_second: */ ldr r4, =boot_second @@ -290,6 +299,8 @@ cpu_init_done: strd r2, r3, [r4, #8] /* Map it in slot 1 */ /* ... map of paddr(start) in boot_second */ + cmp r6, #1 /* r6 is set if already created */ + beq 1f lsr r2, r9, #SECOND_SHIFT /* Offset of base paddr in boot_second */ ldr r3, =LPAE_ENTRY_MASK and r1, r2, r3 @@ -302,6 +313,7 @@ cpu_init_done: mov r3, #0x0 lsl r1, r1, #3 /* r1 := Slot offset */ strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + mov r6, #1 /* r6 := identity map now in place */ /* Setup boot_third: */ 1: ldr r4, =boot_third @@ -326,8 +338,10 @@ cpu_init_done: /* boot pagetable setup complete */ - b 1f - + cmp r6, #1 /* Did we manage to create an identity mapping ? */ + beq 1f + PRINT("Unable to build boot page tables - Failed to identity map Xen.\r\n") + b fail virtphys_clash: /* Identity map clashes with boot_third, which we cannot handle yet */ PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 99eb0a6..4f0ea2d 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -62,7 +62,7 @@ * x22 - is_secondary_cpu * x23 - UART address * x24 - cpuid - * x25 - + * x25 - identity map in place * x26 - * x27 - * x28 - @@ -253,6 +253,13 @@ skip_bss: * mapping. So each CPU must rebuild the page tables here with * the 1:1 in place. */ + /* If Xen is loaded at exactly XEN_VIRT_START then we don't + * need an additional 1:1 mapping, the virtual mapping will + * suffice. + */ + cmp x19, #XEN_VIRT_START + cset x25, eq /* x25 := identity map in place, or not */ + /* Write Xen's PT's paddr into TTBR0_EL2 */ ldr x4, =boot_pgtable add x4, x4, x20 /* x4 := paddr (boot_pagetable) */ @@ -293,6 +300,7 @@ skip_bss: and x1, x1, #LPAE_ENTRY_MASK /* x1 := Slot offset */ lsl x1, x1, #3 str x2, [x4, x1] /* Mapping of paddr(start) */ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_first: */ ldr x4, =boot_first /* Next level into boot_first */ @@ -306,6 +314,7 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_first */ + cbnz x25, 1f /* x25 is set if already created */ lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ @@ -315,6 +324,7 @@ skip_bss: orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ str x2, [x4, x1] /* Create mapping of paddr(start)*/ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_second: */ ldr x4, =boot_second /* Next level into boot_second */ @@ -328,6 +338,7 @@ skip_bss: str x2, [x4, #8] /* Map it in slot 1 */ /* ... map of paddr(start) in boot_second */ + cbnz x25, 1f /* x25 is set if already created */ lsr x2, x19, #SECOND_SHIFT /* x2 := Offset of base paddr in boot_second */ and x1, x2, #LPAE_ENTRY_MASK /* x1 := Slot to use */ cmp x1, #1 @@ -338,6 +349,7 @@ skip_bss: orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ str x2, [x4, x1] /* Create mapping of paddr(start)*/ + mov x25, #1 /* x25 := identity map now in place */ 1: /* Setup boot_third: */ ldr x4, =boot_third @@ -361,8 +373,9 @@ skip_bss: /* boot pagetable setup complete */ - b 1f - + cbnz x25, 1f /* Did we manage to create an identity mapping ? */ + PRINT("Unable to build boot page tables - Failed to identity map Xen.\r\n") + b fail virtphys_clash: /* Identity map clashes with boot_third, which we cannot handle yet */ PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyh-0007sI-6Y; Mon, 28 Jul 2014 12:24:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyf-0007s0-II for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:29 +0000 Received: from [193.109.254.147:32399] by server-13.bemta-14.messagelabs.com id 3C/97-19311-CF046D35; Mon, 28 Jul 2014 12:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1406550267!8881129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12169 invoked from network); 28 Jul 2014 12:24:28 -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 Jul 2014 12:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyd-0001GN-2A for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyd-0000ki-0C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:27 +0000 Date: Mon, 28 Jul 2014 12:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: ensure that the boot code is <4K in 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 6d848a95df61a76bdf9069b4ba9286d6358784d8 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:59 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: ensure that the boot code is <4K in size This avoids having to deal with the 1:1 boot mapping crossing a section or page boundary. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 ++ xen/arch/arm/arm64/head.S | 2 ++ xen/arch/arm/xen.lds.S | 6 ++++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 0a95b68..2547ce1 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -457,6 +457,8 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +GLOBAL(_end_boot) + /* Copy Xen to new location and switch TTBR * r1:r0 ttbr * r2 source address diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 4f0ea2d..b71b6f0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -487,6 +487,8 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +GLOBAL(_end_boot) + /* Copy Xen to new location and switch TTBR * x0 ttbr * x1 source address diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index be55dad..079e085 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -178,3 +178,9 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +/* + * We require that Xen is loaded at a 4K boundary, so this ensures that any + * code running on the boot time identity map cannot cross a section boundary. + */ +ASSERT( _end_boot - start <= PAGE_SIZE, "Boot code is larger than 4K") -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyh-0007sI-6Y; Mon, 28 Jul 2014 12:24:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyf-0007s0-II for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:29 +0000 Received: from [193.109.254.147:32399] by server-13.bemta-14.messagelabs.com id 3C/97-19311-CF046D35; Mon, 28 Jul 2014 12:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1406550267!8881129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12169 invoked from network); 28 Jul 2014 12:24:28 -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 Jul 2014 12:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyd-0001GN-2A for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyd-0000ki-0C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:27 +0000 Date: Mon, 28 Jul 2014 12:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: ensure that the boot code is <4K in 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 6d848a95df61a76bdf9069b4ba9286d6358784d8 Author: Ian Campbell AuthorDate: Mon Jul 21 13:59:59 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: ensure that the boot code is <4K in size This avoids having to deal with the 1:1 boot mapping crossing a section or page boundary. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 ++ xen/arch/arm/arm64/head.S | 2 ++ xen/arch/arm/xen.lds.S | 6 ++++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 0a95b68..2547ce1 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -457,6 +457,8 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +GLOBAL(_end_boot) + /* Copy Xen to new location and switch TTBR * r1:r0 ttbr * r2 source address diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 4f0ea2d..b71b6f0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -487,6 +487,8 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +GLOBAL(_end_boot) + /* Copy Xen to new location and switch TTBR * x0 ttbr * x1 source address diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index be55dad..079e085 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -178,3 +178,9 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +/* + * We require that Xen is loaded at a 4K boundary, so this ensures that any + * code running on the boot time identity map cannot cross a section boundary. + */ +ASSERT( _end_boot - start <= PAGE_SIZE, "Boot code is larger than 4K") -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyr-0007th-9O; Mon, 28 Jul 2014 12:24:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyp-0007tV-Rc for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:39 +0000 Received: from [193.109.254.147:18661] by server-14.bemta-14.messagelabs.com id DC/51-02763-70146D35; Mon, 28 Jul 2014 12:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1406550277!8881186!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13524 invoked from network); 28 Jul 2014 12:24:38 -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 Jul 2014 12:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyn-0001GV-7t for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyn-0000lE-6h for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:37 +0000 Date: Mon, 28 Jul 2014 12:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly use GLOBAL/ENTRY in head.S, avoid .global X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3412c04b1eeb986670d3c74e5c6c481a0ab9efb Author: Ian Campbell AuthorDate: Mon Jul 21 14:00:00 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Correctly use GLOBAL/ENTRY in head.S, avoid .global Use ENTRY() for function entry points since it ensures correct alignment where GLOBAL() doesn't. The exception is the initial start label which must be at offset 0, so just use GLOBAL() to avoid the possibility of realignment. Since everything happens to already be aligned there should be no difference to the actual binary. objdump agrees. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 8 +++----- xen/arch/arm/arm64/head.S | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 2547ce1..ec57974 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -76,8 +76,7 @@ * It should be linked at XEN_VIRT_START, and loaded at any * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ @@ -583,16 +582,15 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: mov pc, lr #endif /* !CONFIG_EARLY_PRINTK */ /* This provides a C-API version of __lookup_processor_type */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) stmfd sp!, {r4, r10, lr} mov r10, #0 /* r10 := offset between virt&phys */ bl __lookup_processor_type diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b71b6f0..dcb7071 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -100,8 +100,7 @@ * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -604,9 +603,8 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: ret @@ -615,7 +613,7 @@ putn: ret /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) mov x0, #0 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 Mon Jul 28 12:24:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjyr-0007th-9O; Mon, 28 Jul 2014 12:24:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyp-0007tV-Rc for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:39 +0000 Received: from [193.109.254.147:18661] by server-14.bemta-14.messagelabs.com id DC/51-02763-70146D35; Mon, 28 Jul 2014 12:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1406550277!8881186!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13524 invoked from network); 28 Jul 2014 12:24:38 -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 Jul 2014 12:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyn-0001GV-7t for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyn-0000lE-6h for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:37 +0000 Date: Mon, 28 Jul 2014 12:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly use GLOBAL/ENTRY in head.S, avoid .global X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3412c04b1eeb986670d3c74e5c6c481a0ab9efb Author: Ian Campbell AuthorDate: Mon Jul 21 14:00:00 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:17 2014 +0100 xen: arm: Correctly use GLOBAL/ENTRY in head.S, avoid .global Use ENTRY() for function entry points since it ensures correct alignment where GLOBAL() doesn't. The exception is the initial start label which must be at offset 0, so just use GLOBAL() to avoid the possibility of realignment. Since everything happens to already be aligned there should be no difference to the actual binary. objdump agrees. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 8 +++----- xen/arch/arm/arm64/head.S | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 2547ce1..ec57974 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -76,8 +76,7 @@ * It should be linked at XEN_VIRT_START, and loaded at any * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ @@ -583,16 +582,15 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: mov pc, lr #endif /* !CONFIG_EARLY_PRINTK */ /* This provides a C-API version of __lookup_processor_type */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) stmfd sp!, {r4, r10, lr} mov r10, #0 /* r10 := offset between virt&phys */ bl __lookup_processor_type diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b71b6f0..dcb7071 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -100,8 +100,7 @@ * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -604,9 +603,8 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: ret @@ -615,7 +613,7 @@ putn: ret /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) mov x0, #0 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 Mon Jul 28 12:24:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjz1-0007vJ-C5; Mon, 28 Jul 2014 12:24:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz0-0007v3-5C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:50 +0000 Received: from [85.158.139.211:5416] by server-12.bemta-5.messagelabs.com id 89/BB-22251-11146D35; Mon, 28 Jul 2014 12:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1406550287!14627300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27359 invoked from network); 28 Jul 2014 12:24:48 -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; 28 Jul 2014 12:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyx-0001Gb-Dv for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyx-0000lf-CD for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:47 +0000 Date: Mon, 28 Jul 2014 12:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Only lookup kernel/initrd bootmodule once while building 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 0040b649d6df262e7aa3f903bbe1279f1aebac5c Author: Ian Campbell AuthorDate: Mon Jul 21 13:09:16 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 xen: arm: Only lookup kernel/initrd bootmodule once while building dom0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 2 ++ xen/arch/arm/kernel.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 154367e..23261e4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -405,7 +405,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + const struct bootmodule *mod = kinfo->kernel_bootmodule; if ( mod && mod->cmdline[0] ) bootargs = &mod->cmdline[0]; @@ -455,7 +455,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = kinfo->initrd_bootmodule; if ( bootargs ) { @@ -1224,7 +1224,7 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = kinfo->initrd_bootmodule; paddr_t load_addr = kinfo->initrd_paddr; paddr_t paddr, len; unsigned long offs; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 230ff8f..eaeadb5 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -116,6 +116,7 @@ static void place_modules(struct kernel_info *info, info->dtb_paddr = modbase; info->initrd_paddr = info->dtb_paddr + dtb_len; + info->initrd_bootmodule = mod; } static paddr_t kernel_zimage_place(struct kernel_info *info) @@ -383,6 +384,7 @@ int kernel_probe(struct kernel_info *info) return -ENOENT; } + info->kernel_bootmodule = mod; start = mod->start; size = mod->size; diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index 7c7f624..0050dfb 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -23,6 +23,7 @@ struct kernel_info { paddr_t entry; /* boot blob load addresses */ + const struct bootmodule *kernel_bootmodule, *initrd_bootmodule; paddr_t dtb_paddr; paddr_t initrd_paddr; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:24:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:24: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 1XBjz1-0007vJ-C5; Mon, 28 Jul 2014 12:24:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz0-0007v3-5C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:50 +0000 Received: from [85.158.139.211:5416] by server-12.bemta-5.messagelabs.com id 89/BB-22251-11146D35; Mon, 28 Jul 2014 12:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1406550287!14627300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27359 invoked from network); 28 Jul 2014 12:24:48 -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; 28 Jul 2014 12:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjyx-0001Gb-Dv for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjyx-0000lf-CD for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:47 +0000 Date: Mon, 28 Jul 2014 12:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Only lookup kernel/initrd bootmodule once while building 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 0040b649d6df262e7aa3f903bbe1279f1aebac5c Author: Ian Campbell AuthorDate: Mon Jul 21 13:09:16 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 xen: arm: Only lookup kernel/initrd bootmodule once while building dom0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 2 ++ xen/arch/arm/kernel.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 154367e..23261e4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -405,7 +405,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int res = 0; int had_dom0_bootargs = 0; - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + const struct bootmodule *mod = kinfo->kernel_bootmodule; if ( mod && mod->cmdline[0] ) bootargs = &mod->cmdline[0]; @@ -455,7 +455,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = kinfo->initrd_bootmodule; if ( bootargs ) { @@ -1224,7 +1224,7 @@ static void dtb_load(struct kernel_info *kinfo) static void initrd_load(struct kernel_info *kinfo) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = kinfo->initrd_bootmodule; paddr_t load_addr = kinfo->initrd_paddr; paddr_t paddr, len; unsigned long offs; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 230ff8f..eaeadb5 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -116,6 +116,7 @@ static void place_modules(struct kernel_info *info, info->dtb_paddr = modbase; info->initrd_paddr = info->dtb_paddr + dtb_len; + info->initrd_bootmodule = mod; } static paddr_t kernel_zimage_place(struct kernel_info *info) @@ -383,6 +384,7 @@ int kernel_probe(struct kernel_info *info) return -ENOENT; } + info->kernel_bootmodule = mod; start = mod->start; size = mod->size; diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index 7c7f624..0050dfb 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -23,6 +23,7 @@ struct kernel_info { paddr_t entry; /* boot blob load addresses */ + const struct bootmodule *kernel_bootmodule, *initrd_bootmodule; paddr_t dtb_paddr; paddr_t initrd_paddr; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzB-0007x2-Ev; Mon, 28 Jul 2014 12:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz9-0007wk-Uw for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:00 +0000 Received: from [85.158.139.211:6440] by server-16.bemta-5.messagelabs.com id 54/63-01029-B1146D35; Mon, 28 Jul 2014 12:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1406550297!17975404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31729 invoked from network); 28 Jul 2014 12:24:58 -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 Jul 2014 12:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz7-0001Gn-Ii for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjz7-0000m3-HK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:57 +0000 Date: Mon, 28 Jul 2014 12:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: don't release modules which aren't in RAM into the heap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 597eaa8db932741f4b49336d5638c5a1833d4f2f Author: Ian Campbell AuthorDate: Wed Jul 23 17:45:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 xen: arm: don't release modules which aren't in RAM into the heap They might be in e.g. flash or something but more likely they could be in a bank of RAM which we aren't handling or in RAM which the bootloader hasn't told us about for some reason. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: Fu Wei Cc: Roy Franz --- xen/arch/arm/setup.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index e53e491..446b4dc 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -247,8 +247,13 @@ void __init discard_initial_modules(void) paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - if ( mi->module[i].kind != BOOTMOD_XEN ) - dt_unreserved_regions(s, e, init_domheap_pages, 0); + if ( mi->module[i].kind == BOOTMOD_XEN ) + continue; + + if ( !mfn_valid(paddr_to_pfn(s)) || !mfn_valid(paddr_to_pfn(e))) + continue; + + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 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 Mon Jul 28 12:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzB-0007x2-Ev; Mon, 28 Jul 2014 12:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz9-0007wk-Uw for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:00 +0000 Received: from [85.158.139.211:6440] by server-16.bemta-5.messagelabs.com id 54/63-01029-B1146D35; Mon, 28 Jul 2014 12:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1406550297!17975404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31729 invoked from network); 28 Jul 2014 12:24:58 -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 Jul 2014 12:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjz7-0001Gn-Ii for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjz7-0000m3-HK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:24:57 +0000 Date: Mon, 28 Jul 2014 12:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: don't release modules which aren't in RAM into the heap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 597eaa8db932741f4b49336d5638c5a1833d4f2f Author: Ian Campbell AuthorDate: Wed Jul 23 17:45:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 xen: arm: don't release modules which aren't in RAM into the heap They might be in e.g. flash or something but more likely they could be in a bank of RAM which we aren't handling or in RAM which the bootloader hasn't told us about for some reason. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: Fu Wei Cc: Roy Franz --- xen/arch/arm/setup.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index e53e491..446b4dc 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -247,8 +247,13 @@ void __init discard_initial_modules(void) paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - if ( mi->module[i].kind != BOOTMOD_XEN ) - dt_unreserved_regions(s, e, init_domheap_pages, 0); + if ( mi->module[i].kind == BOOTMOD_XEN ) + continue; + + if ( !mfn_valid(paddr_to_pfn(s)) || !mfn_valid(paddr_to_pfn(e))) + continue; + + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 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 Mon Jul 28 12:25:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzd-0007zc-Im; Mon, 28 Jul 2014 12:25:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzd-0007zU-7T for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:29 +0000 Received: from [193.109.254.147:19923] by server-16.bemta-14.messagelabs.com id 59/46-14741-83146D35; Mon, 28 Jul 2014 12:25:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1406550323!12219733!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9875 invoked from network); 28 Jul 2014 12:25:24 -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; 28 Jul 2014 12:25:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzR-0001HM-Ub for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzH-0000me-N7 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:07 +0000 Date: Mon, 28 Jul 2014 12:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: tpm: fix array access in locality_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 52bdfeacbb601da2d66b5b1dde159b973ee8b309 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:15 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 mini-os: tpm: fix array access in locality_enabled gcc-4.3 fails to prove that array indices will remain positive. Add a hint for the compiler and check the index value before using it. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- extras/mini-os/tpm_tis.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index e8ca69f..dc4134a 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -611,7 +611,7 @@ s_time_t tpm_calc_ordinal_duration(struct tpm_chip *chip, static int locality_enabled(struct tpm_chip* tpm, int l) { - return tpm->enabled_localities & (1 << l); + return l >= 0 && tpm->enabled_localities & (1 << l); } static int check_locality(struct tpm_chip* tpm, int 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 Mon Jul 28 12:25:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzd-0007zc-Im; Mon, 28 Jul 2014 12:25:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzd-0007zU-7T for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:29 +0000 Received: from [193.109.254.147:19923] by server-16.bemta-14.messagelabs.com id 59/46-14741-83146D35; Mon, 28 Jul 2014 12:25:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1406550323!12219733!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9875 invoked from network); 28 Jul 2014 12:25:24 -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; 28 Jul 2014 12:25:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzR-0001HM-Ub for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzH-0000me-N7 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:07 +0000 Date: Mon, 28 Jul 2014 12:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: tpm: fix array access in locality_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 52bdfeacbb601da2d66b5b1dde159b973ee8b309 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:15 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 mini-os: tpm: fix array access in locality_enabled gcc-4.3 fails to prove that array indices will remain positive. Add a hint for the compiler and check the index value before using it. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- extras/mini-os/tpm_tis.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index e8ca69f..dc4134a 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -611,7 +611,7 @@ s_time_t tpm_calc_ordinal_duration(struct tpm_chip *chip, static int locality_enabled(struct tpm_chip* tpm, int l) { - return tpm->enabled_localities & (1 << l); + return l >= 0 && tpm->enabled_localities & (1 << l); } static int check_locality(struct tpm_chip* tpm, int 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 Mon Jul 28 12:25:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzf-00080K-LF; Mon, 28 Jul 2014 12:25:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjze-000800-Fe for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:30 +0000 Received: from [193.109.254.147:42333] by server-11.bemta-14.messagelabs.com id D8/AD-14213-93146D35; Mon, 28 Jul 2014 12:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1406550328!6806316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3274 invoked from network); 28 Jul 2014 12:25:29 -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; 28 Jul 2014 12:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzc-0001HV-3W for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzc-0000ni-1v for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:28 +0000 Date: Mon, 28 Jul 2014 12:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: tpm: remove usage of inline keyword X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c552a43edb69a3a93e51360a65e44768aa1b0944 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:16 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 mini-os: tpm: remove usage of inline keyword Compilation fails with gcc-4.3: tpmback.c: In function 'tpmback_resp': tpmback.c:148: error: inlining failed in call to 'tpmdev_check_req': call is unlikely and code size would grow tpmback.c:165: error: called from here tpmback.c: In function 'new_tpmif': tpmback.c:384: error: inlining failed in call to '__init_tpmif': call is unlikely and code size would grow tpmback.c:425: error: called from here Adjust code to use static instead of inline, it has the same effect. Change also tpmif_req_ready and tpmif_req_finished before they start to cause failures. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- extras/mini-os/tpmback.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c index 31da8d5..00b66e8 100644 --- a/extras/mini-os/tpmback.c +++ b/extras/mini-os/tpmback.c @@ -140,12 +140,12 @@ int globalinit = 0; * Duplicates are not allowed * **********************************/ -inline void tpmif_req_ready(tpmif_t* tpmif) { +static void tpmif_req_ready(tpmif_t* tpmif) { tpmif->flags |= TPMIF_REQ_READY; gtpmdev.flags |= TPMIF_REQ_READY; } -inline void tpmdev_check_req(void) { +static void tpmdev_check_req(void) { int i; int flags; local_irq_save(flags); @@ -160,7 +160,7 @@ inline void tpmdev_check_req(void) { local_irq_restore(flags); } -inline void tpmif_req_finished(tpmif_t* tpmif) { +static void tpmif_req_finished(tpmif_t* tpmif) { tpmif->flags &= ~TPMIF_REQ_READY; tpmdev_check_req(); } @@ -382,7 +382,7 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) /********************************** * TPMIF CREATION AND DELETION * *******************************/ -inline tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) +static tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) { tpmif_t* tpmif; tpmif = malloc(sizeof(*tpmif)); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:25:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzf-00080K-LF; Mon, 28 Jul 2014 12:25:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjze-000800-Fe for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:30 +0000 Received: from [193.109.254.147:42333] by server-11.bemta-14.messagelabs.com id D8/AD-14213-93146D35; Mon, 28 Jul 2014 12:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1406550328!6806316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3274 invoked from network); 28 Jul 2014 12:25:29 -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; 28 Jul 2014 12:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzc-0001HV-3W for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzc-0000ni-1v for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:28 +0000 Date: Mon, 28 Jul 2014 12:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: tpm: remove usage of inline keyword X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c552a43edb69a3a93e51360a65e44768aa1b0944 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:16 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 mini-os: tpm: remove usage of inline keyword Compilation fails with gcc-4.3: tpmback.c: In function 'tpmback_resp': tpmback.c:148: error: inlining failed in call to 'tpmdev_check_req': call is unlikely and code size would grow tpmback.c:165: error: called from here tpmback.c: In function 'new_tpmif': tpmback.c:384: error: inlining failed in call to '__init_tpmif': call is unlikely and code size would grow tpmback.c:425: error: called from here Adjust code to use static instead of inline, it has the same effect. Change also tpmif_req_ready and tpmif_req_finished before they start to cause failures. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- extras/mini-os/tpmback.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c index 31da8d5..00b66e8 100644 --- a/extras/mini-os/tpmback.c +++ b/extras/mini-os/tpmback.c @@ -140,12 +140,12 @@ int globalinit = 0; * Duplicates are not allowed * **********************************/ -inline void tpmif_req_ready(tpmif_t* tpmif) { +static void tpmif_req_ready(tpmif_t* tpmif) { tpmif->flags |= TPMIF_REQ_READY; gtpmdev.flags |= TPMIF_REQ_READY; } -inline void tpmdev_check_req(void) { +static void tpmdev_check_req(void) { int i; int flags; local_irq_save(flags); @@ -160,7 +160,7 @@ inline void tpmdev_check_req(void) { local_irq_restore(flags); } -inline void tpmif_req_finished(tpmif_t* tpmif) { +static void tpmif_req_finished(tpmif_t* tpmif) { tpmif->flags &= ~TPMIF_REQ_READY; tpmdev_check_req(); } @@ -382,7 +382,7 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) /********************************** * TPMIF CREATION AND DELETION * *******************************/ -inline tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) +static tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) { tpmif_t* tpmif; tpmif = malloc(sizeof(*tpmif)); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:25:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzp-000823-O1; Mon, 28 Jul 2014 12:25:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzp-00081n-00 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:41 +0000 Received: from [85.158.137.68:22472] by server-3.bemta-3.messagelabs.com id 36/BC-22751-44146D35; Mon, 28 Jul 2014 12:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1406550338!15962727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9130 invoked from network); 28 Jul 2014 12:25:39 -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; 28 Jul 2014 12:25:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzm-0001He-8a for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzm-0000oB-6m for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:38 +0000 Date: Mon, 28 Jul 2014 12:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix -Wextra usage in vtpm_emulator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed4ef4bf2dce354b0cdde8460698fc0b50cf8975 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:17 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 stubdom: fix -Wextra usage in vtpm_emulator If -Wextra is appended to CFLAGS it will enable all warnings. Previous options such as -Wno-unused-parameters have no effect anymore. As a result compilation will fail with gcc-4.3. Newer versions of gcc will appearently remember -Wno-* options before -Wextra. Rearrange warning options for gcc so that -Wextra comes before other -W options. This fixes compilation of stubdom in SLES11. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- stubdom/Makefile | 1 + stubdom/vtpm-cmake-Wextra.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index c41de27..6bea68b 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -210,6 +210,7 @@ tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz patch -d $@ -p1 < vtpm-locality.patch patch -d $@ -p1 < vtpm-parent-sign-ek.patch patch -d $@ -p1 < vtpm-deepquote.patch + patch -d $@ -p1 < vtpm-cmake-Wextra.patch mkdir $@/build cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement" touch $@ diff --git a/stubdom/vtpm-cmake-Wextra.patch b/stubdom/vtpm-cmake-Wextra.patch new file mode 100644 index 0000000..a603654 --- /dev/null +++ b/stubdom/vtpm-cmake-Wextra.patch @@ -0,0 +1,21 @@ +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: tpm_emulator-x86_64/CMakeLists.txt +=================================================================== +--- tpm_emulator-x86_64.orig/CMakeLists.txt ++++ tpm_emulator-x86_64/CMakeLists.txt +@@ -40,10 +40,11 @@ set(TPM_STORAGE_NAME "/var/lib/tpm/tpm_e + set(TPM_DEVICE_NAME "/dev/tpm") + endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +-add_definitions(-Wall -Werror -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings) ++add_definitions(-Wall -Werror) + if("${CMAKE_SYSTEM}" MATCHES "Linux") + add_definitions(-Wextra) + endif() ++add_definitions(-Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings) + if(USE_OPENSSL) + add_definitions(-DUSE_OPENSSL) + 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 Mon Jul 28 12:25:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzp-000823-O1; Mon, 28 Jul 2014 12:25:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzp-00081n-00 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:41 +0000 Received: from [85.158.137.68:22472] by server-3.bemta-3.messagelabs.com id 36/BC-22751-44146D35; Mon, 28 Jul 2014 12:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1406550338!15962727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9130 invoked from network); 28 Jul 2014 12:25:39 -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; 28 Jul 2014 12:25:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzm-0001He-8a for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzm-0000oB-6m for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:38 +0000 Date: Mon, 28 Jul 2014 12:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix -Wextra usage in vtpm_emulator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed4ef4bf2dce354b0cdde8460698fc0b50cf8975 Author: Olaf Hering AuthorDate: Tue Jul 22 09:19:17 2014 +0200 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 stubdom: fix -Wextra usage in vtpm_emulator If -Wextra is appended to CFLAGS it will enable all warnings. Previous options such as -Wno-unused-parameters have no effect anymore. As a result compilation will fail with gcc-4.3. Newer versions of gcc will appearently remember -Wno-* options before -Wextra. Rearrange warning options for gcc so that -Wextra comes before other -W options. This fixes compilation of stubdom in SLES11. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- stubdom/Makefile | 1 + stubdom/vtpm-cmake-Wextra.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index c41de27..6bea68b 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -210,6 +210,7 @@ tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz patch -d $@ -p1 < vtpm-locality.patch patch -d $@ -p1 < vtpm-parent-sign-ek.patch patch -d $@ -p1 < vtpm-deepquote.patch + patch -d $@ -p1 < vtpm-cmake-Wextra.patch mkdir $@/build cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement" touch $@ diff --git a/stubdom/vtpm-cmake-Wextra.patch b/stubdom/vtpm-cmake-Wextra.patch new file mode 100644 index 0000000..a603654 --- /dev/null +++ b/stubdom/vtpm-cmake-Wextra.patch @@ -0,0 +1,21 @@ +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: tpm_emulator-x86_64/CMakeLists.txt +=================================================================== +--- tpm_emulator-x86_64.orig/CMakeLists.txt ++++ tpm_emulator-x86_64/CMakeLists.txt +@@ -40,10 +40,11 @@ set(TPM_STORAGE_NAME "/var/lib/tpm/tpm_e + set(TPM_DEVICE_NAME "/dev/tpm") + endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +-add_definitions(-Wall -Werror -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings) ++add_definitions(-Wall -Werror) + if("${CMAKE_SYSTEM}" MATCHES "Linux") + add_definitions(-Wextra) + endif() ++add_definitions(-Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings) + if(USE_OPENSSL) + add_definitions(-DUSE_OPENSSL) + 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 Mon Jul 28 12:25:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzz-00083r-Sl; Mon, 28 Jul 2014 12:25:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzz-00083f-3C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:51 +0000 Received: from [193.109.254.147:22984] by server-6.bemta-14.messagelabs.com id F1/B8-31278-E4146D35; Mon, 28 Jul 2014 12:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1406550348!12211029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6934 invoked from network); 28 Jul 2014 12:25:49 -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; 28 Jul 2014 12:25:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzw-0001Hk-Dl for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzw-0000ob-Bj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:48 +0000 Date: Mon, 28 Jul 2014 12:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: the name of a KeyedUnion discriminator need not be '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 9a098f1e87fd1f82e18a750ece4362c06edb3daf Author: David Scott AuthorDate: Tue Jul 22 16:05:18 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 libxl IDL: the name of a KeyedUnion discriminator need not be 'type' Signed-off-by: David Scott Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 4b0c996..3e73821 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -440,7 +440,7 @@ def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discrimina (f.type.keyvar.name + "." + x.name, w) s += " if (x) {\n" (nparent, fexpr) = ty.member(v, f.type.keyvar, parent is None) - s += " %s_init_type(%s, %s);\n" % (ty.typename, v, x.enumname) + s += " %s_init_%s(%s, %s);\n" % (ty.typename, f.type.keyvar.name, v, x.enumname) (nparent,fexpr) = ty.member(v, f, parent is None) s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent, x.enumname) s += " }\n" -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:25:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:25: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 1XBjzz-00083r-Sl; Mon, 28 Jul 2014 12:25:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzz-00083f-3C for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:51 +0000 Received: from [193.109.254.147:22984] by server-6.bemta-14.messagelabs.com id F1/B8-31278-E4146D35; Mon, 28 Jul 2014 12:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1406550348!12211029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6934 invoked from network); 28 Jul 2014 12:25:49 -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; 28 Jul 2014 12:25:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBjzw-0001Hk-Dl for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBjzw-0000ob-Bj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:48 +0000 Date: Mon, 28 Jul 2014 12:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl IDL: the name of a KeyedUnion discriminator need not be '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 9a098f1e87fd1f82e18a750ece4362c06edb3daf Author: David Scott AuthorDate: Tue Jul 22 16:05:18 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:18 2014 +0100 libxl IDL: the name of a KeyedUnion discriminator need not be 'type' Signed-off-by: David Scott Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 4b0c996..3e73821 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -440,7 +440,7 @@ def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discrimina (f.type.keyvar.name + "." + x.name, w) s += " if (x) {\n" (nparent, fexpr) = ty.member(v, f.type.keyvar, parent is None) - s += " %s_init_type(%s, %s);\n" % (ty.typename, v, x.enumname) + s += " %s_init_%s(%s, %s);\n" % (ty.typename, f.type.keyvar.name, v, x.enumname) (nparent,fexpr) = ty.member(v, f, parent is None) s += libxl_C_type_parse_json(f.type, "x", fexpr, " ", nparent, x.enumname) s += " }\n" -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0A-00085m-Uc; Mon, 28 Jul 2014 12:26:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk08-00085W-QW for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:00 +0000 Received: from [85.158.143.35:12778] by server-3.bemta-4.messagelabs.com id 75/BF-06192-85146D35; Mon, 28 Jul 2014 12:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1406550358!11854257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9896 invoked from network); 28 Jul 2014 12:25:59 -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; 28 Jul 2014 12:25:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk06-0001Ht-IE for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk06-0000oy-HF for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:58 +0000 Date: Mon, 28 Jul 2014 12:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Newline on 'Logfile Opened' 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 743803911c8d2fd49f01693de4d01e5053d8bf48 Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:14 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Newline on 'Logfile Opened' messages Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 46719a8..313b256 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -276,8 +276,8 @@ static int create_hv_log(void) dolog(LOG_ERR, "Failed to open log %s: %d (%s)", logfile, errno, strerror(errno)); if (fd != -1 && log_time_hv) { - if (write_with_timestamp(fd, "Logfile Opened", - strlen("Logfile Opened"), + if (write_with_timestamp(fd, "Logfile Opened\n", + strlen("Logfile Opened\n"), &log_time_hv_needts) < 0) { dolog(LOG_ERR, "Failed to log opening timestamp " "in %s: %d (%s)", logfile, errno, @@ -322,8 +322,8 @@ static int create_domain_log(struct domain *dom) dolog(LOG_ERR, "Failed to open log %s: %d (%s)", logfile, errno, strerror(errno)); if (fd != -1 && log_time_guest) { - if (write_with_timestamp(fd, "Logfile Opened", - strlen("Logfile Opened"), + if (write_with_timestamp(fd, "Logfile Opened\n", + strlen("Logfile Opened\n"), &log_time_guest_needts) < 0) { dolog(LOG_ERR, "Failed to log opening timestamp " "in %s: %d (%s)", logfile, 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 Mon Jul 28 12:26:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0A-00085m-Uc; Mon, 28 Jul 2014 12:26:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk08-00085W-QW for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:00 +0000 Received: from [85.158.143.35:12778] by server-3.bemta-4.messagelabs.com id 75/BF-06192-85146D35; Mon, 28 Jul 2014 12:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1406550358!11854257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9896 invoked from network); 28 Jul 2014 12:25:59 -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; 28 Jul 2014 12:25:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk06-0001Ht-IE for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk06-0000oy-HF for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:25:58 +0000 Date: Mon, 28 Jul 2014 12:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Newline on 'Logfile Opened' 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 743803911c8d2fd49f01693de4d01e5053d8bf48 Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:14 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Newline on 'Logfile Opened' messages Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 46719a8..313b256 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -276,8 +276,8 @@ static int create_hv_log(void) dolog(LOG_ERR, "Failed to open log %s: %d (%s)", logfile, errno, strerror(errno)); if (fd != -1 && log_time_hv) { - if (write_with_timestamp(fd, "Logfile Opened", - strlen("Logfile Opened"), + if (write_with_timestamp(fd, "Logfile Opened\n", + strlen("Logfile Opened\n"), &log_time_hv_needts) < 0) { dolog(LOG_ERR, "Failed to log opening timestamp " "in %s: %d (%s)", logfile, errno, @@ -322,8 +322,8 @@ static int create_domain_log(struct domain *dom) dolog(LOG_ERR, "Failed to open log %s: %d (%s)", logfile, errno, strerror(errno)); if (fd != -1 && log_time_guest) { - if (write_with_timestamp(fd, "Logfile Opened", - strlen("Logfile Opened"), + if (write_with_timestamp(fd, "Logfile Opened\n", + strlen("Logfile Opened\n"), &log_time_guest_needts) < 0) { dolog(LOG_ERR, "Failed to log opening timestamp " "in %s: %d (%s)", logfile, 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 Mon Jul 28 12:26:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0L-00087P-2G; Mon, 28 Jul 2014 12:26:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0K-000878-1T for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:12 +0000 Received: from [85.158.137.68:54339] by server-17.bemta-3.messagelabs.com id 0E/AA-27015-36146D35; Mon, 28 Jul 2014 12:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1406550369!18410039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1683 invoked from network); 28 Jul 2014 12:26:10 -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; 28 Jul 2014 12:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0G-0001IS-Pi for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0G-0000pc-Lx for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:08 +0000 Date: Mon, 28 Jul 2014 12:26:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Possibly perform repeated xc_readconsolering() hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a04d97a01936bff5388947f1348ac144b64101 Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:15 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Possibly perform repeated xc_readconsolering() hypercalls The size of the Xen console ring is runtime configurable, so the statically sized 16k buffer is not necessarily sufficient. Make repeated xc_readconsolering() hypercalls while Xen managed to completely fill the provided buffer. Also, change the buffer to being static to save on stack space. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 313b256..b1268fa 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -909,17 +909,24 @@ static void handle_xs(void) static void handle_hv_logs(xc_evtchn *xce_handle) { - char buffer[1024*16]; + static char buffer[1024*16]; char *bufptr = buffer; - unsigned int size = sizeof(buffer); + unsigned int size; static uint32_t index = 0; evtchn_port_or_error_t port; if ((port = xc_evtchn_pending(xce_handle)) == -1) return; - if (xc_readconsolering(xc, bufptr, &size, 0, 1, &index) == 0 && size > 0) { + do + { int logret; + + size = sizeof(buffer); + if (xc_readconsolering(xc, bufptr, &size, 0, 1, &index) != 0 || + size == 0) + break; + if (log_time_hv) logret = write_with_timestamp(log_hv_fd, buffer, size, &log_time_hv_needts); @@ -929,7 +936,7 @@ static void handle_hv_logs(xc_evtchn *xce_handle) if (logret < 0) dolog(LOG_ERR, "Failed to write hypervisor log: " "%d (%s)", errno, strerror(errno)); - } + } while (size == sizeof(buffer)); (void)xc_evtchn_unmask(xce_handle, port); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0L-00087P-2G; Mon, 28 Jul 2014 12:26:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0K-000878-1T for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:12 +0000 Received: from [85.158.137.68:54339] by server-17.bemta-3.messagelabs.com id 0E/AA-27015-36146D35; Mon, 28 Jul 2014 12:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1406550369!18410039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1683 invoked from network); 28 Jul 2014 12:26:10 -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; 28 Jul 2014 12:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0G-0001IS-Pi for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0G-0000pc-Lx for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:08 +0000 Date: Mon, 28 Jul 2014 12:26:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Possibly perform repeated xc_readconsolering() hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a04d97a01936bff5388947f1348ac144b64101 Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:15 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Possibly perform repeated xc_readconsolering() hypercalls The size of the Xen console ring is runtime configurable, so the statically sized 16k buffer is not necessarily sufficient. Make repeated xc_readconsolering() hypercalls while Xen managed to completely fill the provided buffer. Also, change the buffer to being static to save on stack space. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 313b256..b1268fa 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -909,17 +909,24 @@ static void handle_xs(void) static void handle_hv_logs(xc_evtchn *xce_handle) { - char buffer[1024*16]; + static char buffer[1024*16]; char *bufptr = buffer; - unsigned int size = sizeof(buffer); + unsigned int size; static uint32_t index = 0; evtchn_port_or_error_t port; if ((port = xc_evtchn_pending(xce_handle)) == -1) return; - if (xc_readconsolering(xc, bufptr, &size, 0, 1, &index) == 0 && size > 0) { + do + { int logret; + + size = sizeof(buffer); + if (xc_readconsolering(xc, bufptr, &size, 0, 1, &index) != 0 || + size == 0) + break; + if (log_time_hv) logret = write_with_timestamp(log_hv_fd, buffer, size, &log_time_hv_needts); @@ -929,7 +936,7 @@ static void handle_hv_logs(xc_evtchn *xce_handle) if (logret < 0) dolog(LOG_ERR, "Failed to write hypervisor log: " "%d (%s)", errno, strerror(errno)); - } + } while (size == sizeof(buffer)); (void)xc_evtchn_unmask(xce_handle, port); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0U-00088h-58; Mon, 28 Jul 2014 12:26:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0T-00088S-Dd for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:21 +0000 Received: from [193.109.254.147:31044] by server-9.bemta-14.messagelabs.com id 0D/1E-31535-C6146D35; Mon, 28 Jul 2014 12:26:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406550379!12200813!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30106 invoked from network); 28 Jul 2014 12:26:20 -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; 28 Jul 2014 12:26:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0R-0001Ib-02 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0Q-0000qp-Th for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:18 +0000 Date: Mon, 28 Jul 2014 12:26:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Log Xen boot messages at startup. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e40f01f4d5181feb7e280410bf9bf05e8301279a Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:16 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Log Xen boot messages at startup. When xenconsoled starts, there will be log lines in the Xen console ring from boot, even though VIRQ_CON_RING is not yet pending. Add a force option to handle_hv_logs() which bypasses the event channel check, allowing xenconsoled to drain the Xen boot messages when it starts, rather than at the first subsequent time that VIRQ_CON_RING becomes set. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index b1268fa..ac08b5b 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -907,15 +907,15 @@ static void handle_xs(void) free(vec); } -static void handle_hv_logs(xc_evtchn *xce_handle) +static void handle_hv_logs(xc_evtchn *xce_handle, bool force) { static char buffer[1024*16]; char *bufptr = buffer; unsigned int size; static uint32_t index = 0; - evtchn_port_or_error_t port; + evtchn_port_or_error_t port = -1; - if ((port = xc_evtchn_pending(xce_handle)) == -1) + if (!force && ((port = xc_evtchn_pending(xce_handle)) == -1)) return; do @@ -938,7 +938,8 @@ static void handle_hv_logs(xc_evtchn *xce_handle) "%d (%s)", errno, strerror(errno)); } while (size == sizeof(buffer)); - (void)xc_evtchn_unmask(xce_handle, port); + if (port != -1) + (void)xc_evtchn_unmask(xce_handle, port); } static void handle_log_reload(void) @@ -1024,6 +1025,8 @@ void handle_io(void) "%d (%s)", errno, strerror(errno)); goto out; } + /* Log the boot dmesg even if VIRQ_CON_RING isn't pending. */ + handle_hv_logs(xce_handle, true); } xcg_handle = xc_gnttab_open(NULL, 0); @@ -1134,7 +1137,7 @@ void handle_io(void) errno, strerror(errno)); break; } else if (fds[xce_pollfd_idx].revents & POLLIN) - handle_hv_logs(xce_handle); + handle_hv_logs(xce_handle, false); xce_pollfd_idx = -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 Jul 28 12:26:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0U-00088h-58; Mon, 28 Jul 2014 12:26:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0T-00088S-Dd for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:21 +0000 Received: from [193.109.254.147:31044] by server-9.bemta-14.messagelabs.com id 0D/1E-31535-C6146D35; Mon, 28 Jul 2014 12:26:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406550379!12200813!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30106 invoked from network); 28 Jul 2014 12:26:20 -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; 28 Jul 2014 12:26:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0R-0001Ib-02 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0Q-0000qp-Th for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:18 +0000 Date: Mon, 28 Jul 2014 12:26:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Log Xen boot messages at startup. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e40f01f4d5181feb7e280410bf9bf05e8301279a Author: Andrew Cooper AuthorDate: Tue Jul 22 17:17:16 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 tools/xenconsoled: Log Xen boot messages at startup. When xenconsoled starts, there will be log lines in the Xen console ring from boot, even though VIRQ_CON_RING is not yet pending. Add a force option to handle_hv_logs() which bypasses the event channel check, allowing xenconsoled to drain the Xen boot messages when it starts, rather than at the first subsequent time that VIRQ_CON_RING becomes set. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/console/daemon/io.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index b1268fa..ac08b5b 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -907,15 +907,15 @@ static void handle_xs(void) free(vec); } -static void handle_hv_logs(xc_evtchn *xce_handle) +static void handle_hv_logs(xc_evtchn *xce_handle, bool force) { static char buffer[1024*16]; char *bufptr = buffer; unsigned int size; static uint32_t index = 0; - evtchn_port_or_error_t port; + evtchn_port_or_error_t port = -1; - if ((port = xc_evtchn_pending(xce_handle)) == -1) + if (!force && ((port = xc_evtchn_pending(xce_handle)) == -1)) return; do @@ -938,7 +938,8 @@ static void handle_hv_logs(xc_evtchn *xce_handle) "%d (%s)", errno, strerror(errno)); } while (size == sizeof(buffer)); - (void)xc_evtchn_unmask(xce_handle, port); + if (port != -1) + (void)xc_evtchn_unmask(xce_handle, port); } static void handle_log_reload(void) @@ -1024,6 +1025,8 @@ void handle_io(void) "%d (%s)", errno, strerror(errno)); goto out; } + /* Log the boot dmesg even if VIRQ_CON_RING isn't pending. */ + handle_hv_logs(xce_handle, true); } xcg_handle = xc_gnttab_open(NULL, 0); @@ -1134,7 +1137,7 @@ void handle_io(void) errno, strerror(errno)); break; } else if (fds[xce_pollfd_idx].revents & POLLIN) - handle_hv_logs(xce_handle); + handle_hv_logs(xce_handle, false); xce_pollfd_idx = -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 Jul 28 12:26:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0f-0008AL-7n; Mon, 28 Jul 2014 12:26:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0d-0008A1-TK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:32 +0000 Received: from [85.158.137.68:56602] by server-15.bemta-3.messagelabs.com id 0C/D2-14271-77146D35; Mon, 28 Jul 2014 12:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1406550389!14482722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19792 invoked from network); 28 Jul 2014 12:26:30 -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; 28 Jul 2014 12:26:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0b-0001Ij-6h for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0b-0000rC-4j for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:29 +0000 Date: Mon, 28 Jul 2014 12:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix list_domain_details: check config data length=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 ef8cf0d4902c90595a0b0766e2a9a6ecbcbc4581 Author: Chunyan Liu AuthorDate: Wed Jul 23 17:42:09 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 fix list_domain_details: check config data length=0 If domain is created through virsh, then in xl, one could see it with 'xl list', but with 'xl list --long domU', it reports: "Domain name must be specified." The reason is xl config data does not exist but it still tries to parse_config_data in current code. Improve list_domain_details: If len of config data is 0, just pass, do not go forward to parse_config_data, otherwise, it will meet error like "Domain name not specified" and exit. This error is not expected, since if code enters list_domain_details, domain name validness is already checked and domain does exist. Length of config data is 0 may means: config data does not exist due to some reason, like: domain is created by libvirt, or in destroying domain process config data is cleared but domain fails to clean up. No matter in which case, list_domain_details could just show empty info, but not error like "Domain name not specified". Signed-off-by: Chunyan Liu Acked-by: Ian Jackson --- 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 68df548..01bce2f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3100,6 +3100,8 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) rc = libxl_userdata_retrieve(ctx, info[i].domid, "xl", &data, &len); if (rc) continue; + if (len == 0) + continue; CHK_SYSCALL(asprintf(&config_source, "", info[i].domid)); libxl_domain_config_init(&d_config); parse_config_data(config_source, (char *)data, len, &d_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 Mon Jul 28 12:26:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0f-0008AL-7n; Mon, 28 Jul 2014 12:26:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0d-0008A1-TK for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:32 +0000 Received: from [85.158.137.68:56602] by server-15.bemta-3.messagelabs.com id 0C/D2-14271-77146D35; Mon, 28 Jul 2014 12:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1406550389!14482722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19792 invoked from network); 28 Jul 2014 12:26:30 -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; 28 Jul 2014 12:26:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0b-0001Ij-6h for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0b-0000rC-4j for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:29 +0000 Date: Mon, 28 Jul 2014 12:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix list_domain_details: check config data length=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 ef8cf0d4902c90595a0b0766e2a9a6ecbcbc4581 Author: Chunyan Liu AuthorDate: Wed Jul 23 17:42:09 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 fix list_domain_details: check config data length=0 If domain is created through virsh, then in xl, one could see it with 'xl list', but with 'xl list --long domU', it reports: "Domain name must be specified." The reason is xl config data does not exist but it still tries to parse_config_data in current code. Improve list_domain_details: If len of config data is 0, just pass, do not go forward to parse_config_data, otherwise, it will meet error like "Domain name not specified" and exit. This error is not expected, since if code enters list_domain_details, domain name validness is already checked and domain does exist. Length of config data is 0 may means: config data does not exist due to some reason, like: domain is created by libvirt, or in destroying domain process config data is cleared but domain fails to clean up. No matter in which case, list_domain_details could just show empty info, but not error like "Domain name not specified". Signed-off-by: Chunyan Liu Acked-by: Ian Jackson --- 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 68df548..01bce2f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3100,6 +3100,8 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) rc = libxl_userdata_retrieve(ctx, info[i].domid, "xl", &data, &len); if (rc) continue; + if (len == 0) + continue; CHK_SYSCALL(asprintf(&config_source, "", info[i].domid)); libxl_domain_config_init(&d_config); parse_config_data(config_source, (char *)data, len, &d_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 Mon Jul 28 12:26:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0p-0008By-AT; Mon, 28 Jul 2014 12:26:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0n-0008Bf-Jz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:41 +0000 Received: from [193.109.254.147:18085] by server-15.bemta-14.messagelabs.com id A5/D9-30948-18146D35; Mon, 28 Jul 2014 12:26:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1406550399!6806681!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20274 invoked from network); 28 Jul 2014 12:26:40 -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; 28 Jul 2014 12:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0l-0001Is-C6 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0l-0000rh-AG for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:39 +0000 Date: Mon, 28 Jul 2014 12:26:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: document boot module compatibility based on ordering X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 737a54a5903e44125681fcca6727181b0e64ce99 Author: Ian Campbell AuthorDate: Mon Jul 21 13:16:31 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 xen: arm: document boot module compatibility based on ordering Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index d967061..ad98bf3 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -23,7 +23,13 @@ Each node contains the following properties: compatible string (if one applies) in addition to the generic string (which must always be present). - Xen 4.4 supported a different set of legacy compatible strings + Xen will assume that the first module which lacks a more + specific compatible string is a "multiboot,kernel" and that + the second such is a "multiboot,ramdisk". Any subsequent + modules which lack a specific compatiblity string will not + receive any special treatment. + + Xen 4.4 supported a different set of legacy compatible strings which remain supported such that systems supporting both 4.4 and later can use a single DTB. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk0p-0008By-AT; Mon, 28 Jul 2014 12:26:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0n-0008Bf-Jz for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:41 +0000 Received: from [193.109.254.147:18085] by server-15.bemta-14.messagelabs.com id A5/D9-30948-18146D35; Mon, 28 Jul 2014 12:26:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1406550399!6806681!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20274 invoked from network); 28 Jul 2014 12:26:40 -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; 28 Jul 2014 12:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0l-0001Is-C6 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0l-0000rh-AG for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:39 +0000 Date: Mon, 28 Jul 2014 12:26:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: document boot module compatibility based on ordering X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 737a54a5903e44125681fcca6727181b0e64ce99 Author: Ian Campbell AuthorDate: Mon Jul 21 13:16:31 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:19 2014 +0100 xen: arm: document boot module compatibility based on ordering Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index d967061..ad98bf3 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -23,7 +23,13 @@ Each node contains the following properties: compatible string (if one applies) in addition to the generic string (which must always be present). - Xen 4.4 supported a different set of legacy compatible strings + Xen will assume that the first module which lacks a more + specific compatible string is a "multiboot,kernel" and that + the second such is a "multiboot,ramdisk". Any subsequent + modules which lack a specific compatiblity string will not + receive any special treatment. + + Xen 4.4 supported a different set of legacy compatible strings which remain supported such that systems supporting both 4.4 and later can use a single DTB. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk11-0008DK-D4; Mon, 28 Jul 2014 12:26:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0z-0008D4-Mg for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:53 +0000 Received: from [85.158.137.68:44511] by server-3.bemta-3.messagelabs.com id 11/5E-22751-D8146D35; Mon, 28 Jul 2014 12:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1406550409!18441577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17591 invoked from network); 28 Jul 2014 12:26:50 -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; 28 Jul 2014 12:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0v-0001J0-IG for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0v-0000s7-GL for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:49 +0000 Date: Mon, 28 Jul 2014 12:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: enable usage of config.h on both xenstored and oxenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4b137f4096ababce92a453f2ff6e6e98c7107c6 Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:12 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 xenstored: enable usage of config.h on both xenstored and oxenstored This will be used later for dynamic configuration paths on C code. Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/ocaml/xenstored/Makefile | 2 ++ tools/xenstore/Makefile | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index b18f190..7fa8f53 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -2,6 +2,8 @@ XEN_ROOT = $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make +CFLAGS += -I$(XEN_ROOT)/tools/ + OCAMLINCLUDE += \ -I $(OCAML_TOPLEVEL)/libs/xb \ -I $(OCAML_TOPLEVEL)/libs/mmap \ diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 48b4e3d..08460c8 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -6,6 +6,7 @@ MINOR = 3 CFLAGS += -Werror CFLAGS += -I. +CFLAGS += -I$(XEN_ROOT)/tools/ CFLAGS += $(CFLAGS_libxenctrl) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:26:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:26: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 1XBk11-0008DK-D4; Mon, 28 Jul 2014 12:26:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0z-0008D4-Mg for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:53 +0000 Received: from [85.158.137.68:44511] by server-3.bemta-3.messagelabs.com id 11/5E-22751-D8146D35; Mon, 28 Jul 2014 12:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1406550409!18441577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17591 invoked from network); 28 Jul 2014 12:26:50 -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; 28 Jul 2014 12:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk0v-0001J0-IG for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk0v-0000s7-GL for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:49 +0000 Date: Mon, 28 Jul 2014 12:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: enable usage of config.h on both xenstored and oxenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4b137f4096ababce92a453f2ff6e6e98c7107c6 Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:12 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 xenstored: enable usage of config.h on both xenstored and oxenstored This will be used later for dynamic configuration paths on C code. Acked-by: Ian Campbell Signed-off-by: Luis R. Rodriguez --- tools/ocaml/xenstored/Makefile | 2 ++ tools/xenstore/Makefile | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index b18f190..7fa8f53 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -2,6 +2,8 @@ XEN_ROOT = $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make +CFLAGS += -I$(XEN_ROOT)/tools/ + OCAMLINCLUDE += \ -I $(OCAML_TOPLEVEL)/libs/xb \ -I $(OCAML_TOPLEVEL)/libs/mmap \ diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 48b4e3d..08460c8 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -6,6 +6,7 @@ MINOR = 3 CFLAGS += -Werror CFLAGS += -I. +CFLAGS += -I$(XEN_ROOT)/tools/ CFLAGS += $(CFLAGS_libxenctrl) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1A-0008EL-Fv; Mon, 28 Jul 2014 12:27:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk18-0008E4-B7 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:03 +0000 Received: from [85.158.139.211:36987] by server-6.bemta-5.messagelabs.com id 38/6D-06284-59146D35; Mon, 28 Jul 2014 12:27:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1406550419!17975970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14591 invoked from network); 28 Jul 2014 12:27:00 -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 Jul 2014 12:27:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk15-0001JC-Nj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk15-0000sW-M1 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:59 +0000 Date: Mon, 28 Jul 2014 12:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: add support for systemd active sockets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e82217e34c38f07d286bd57029db47e6590350f Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:13 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 cxenstored: add support for systemd active sockets This adds systemd socket activation support for the C xenstored. Active sockets enable xenstored to be loaded only if required by a system onto which Xen is installed on. Socket activation is handled by systemd, once a port for a service which claims a socket is used systemd will start the required services for it, on demand. For more details on socket activation refer to Lennart's socket-activation post regarding this [0]. Right now this code adds a no-op for this functionality, leaving the enablement to be done later once systemd is properly hooked into the build system. The socket activation is ordered in aligment with the socket activation order passed on to systemd. [0] http://0pointer.de/blog/projects/socket-activation2.html Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 104 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 47f0722..7f72f68 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "utils.h" #include "list.h" @@ -54,6 +55,16 @@ #include "hashtable.h" +#ifndef NO_SOCKETS +#if defined(HAVE_SYSTEMD) +#define XEN_SYSTEMD_ENABLED 1 +#endif +#endif + +#if defined(XEN_SYSTEMD_ENABLED) +#include +#endif + extern xc_evtchn *xce_handle; /* in xenstored_domain.c */ static int xce_pollfd_idx = -1; static struct pollfd *fds; @@ -1714,6 +1725,75 @@ static int destroy_fd(void *_fd) return 0; } +#if defined(XEN_SYSTEMD_ENABLED) +/* Will work regardless of the order systemd gives them to us */ +static int xs_get_sd_fd(const char *connect_to) +{ + int fd = SD_LISTEN_FDS_START; + int r; + + while (fd <= SD_LISTEN_FDS_START + 1) { + r = sd_is_socket_unix(fd, SOCK_STREAM, 1, connect_to, 0); + if (r > 0) + return fd; + fd++; + } + + return -EBADR; +} + +static int xs_validate_active_socket(const char *connect_to) +{ + if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) && + (strcmp("/var/run/xenstored/socket", connect_to) != 0)) { + sd_notifyf(0, "STATUS=unexpected socket: %s\n" + "ERRNO=%i", + connect_to, + EBADR); + return -EBADR; + } + + return xs_get_sd_fd(connect_to); +} + +static void xen_claim_active_sockets(int **psock, int **pro_sock) +{ + int *sock, *ro_sock; + const char *soc_str = xs_daemon_socket(); + const char *soc_str_ro = xs_daemon_socket_ro(); + int n; + + n = sd_listen_fds(0); + if (n <= 0) { + sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" + "ERRNO=%i", + strerror(errno), + errno); + barf_perror("sd_listen_fds() failed\n"); + } else if (n > 2) { + fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); + sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" + "ERRNO=%d", + strerror(EBADR), + EBADR); + barf_perror("sd_listen_fds() gave too many fds\n"); + } + + *psock = sock = talloc(talloc_autofree_context(), int); + *sock = xs_validate_active_socket(soc_str); + if (*sock <= 0) + barf_perror("%s", soc_str); + + *pro_sock = ro_sock = talloc(talloc_autofree_context(), int); + *ro_sock = xs_validate_active_socket(soc_str_ro); + if (*ro_sock <= 0) + barf_perror("%s", soc_str_ro); + + talloc_set_destructor(sock, destroy_fd); + talloc_set_destructor(ro_sock, destroy_fd); +} +#endif + static void init_sockets(int **psock, int **pro_sock) { struct sockaddr_un addr; @@ -1884,6 +1964,15 @@ int main(int argc, char *argv[]) if (optind != argc) barf("%s: No arguments desired", argv[0]); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) { + dofork = false; + if (pidfile) + barf("%s: PID file not needed on systemd", argv[0]); + pidfile = NULL; + } +#endif + reopen_log(); /* make sure xenstored directories exist */ @@ -1905,7 +1994,13 @@ int main(int argc, char *argv[]) /* Don't kill us with SIGPIPE. */ signal(SIGPIPE, SIG_IGN); - init_sockets(&sock, &ro_sock); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) + xen_claim_active_sockets(&sock, &ro_sock); + else +#endif + init_sockets(&sock, &ro_sock); + init_pipe(reopen_log_pipe); /* Setup the database */ @@ -1936,6 +2031,13 @@ int main(int argc, char *argv[]) /* Tell the kernel we're up and running. */ xenbus_notify_running(); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) { + sd_notify(1, "READY=1"); + fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + } +#endif + /* Main loop. */ for (;;) { struct connection *conn, *next; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1A-0008EL-Fv; Mon, 28 Jul 2014 12:27:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk18-0008E4-B7 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:03 +0000 Received: from [85.158.139.211:36987] by server-6.bemta-5.messagelabs.com id 38/6D-06284-59146D35; Mon, 28 Jul 2014 12:27:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1406550419!17975970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14591 invoked from network); 28 Jul 2014 12:27:00 -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 Jul 2014 12:27:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk15-0001JC-Nj for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk15-0000sW-M1 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:26:59 +0000 Date: Mon, 28 Jul 2014 12:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: add support for systemd active sockets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e82217e34c38f07d286bd57029db47e6590350f Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:13 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 cxenstored: add support for systemd active sockets This adds systemd socket activation support for the C xenstored. Active sockets enable xenstored to be loaded only if required by a system onto which Xen is installed on. Socket activation is handled by systemd, once a port for a service which claims a socket is used systemd will start the required services for it, on demand. For more details on socket activation refer to Lennart's socket-activation post regarding this [0]. Right now this code adds a no-op for this functionality, leaving the enablement to be done later once systemd is properly hooked into the build system. The socket activation is ordered in aligment with the socket activation order passed on to systemd. [0] http://0pointer.de/blog/projects/socket-activation2.html Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 104 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 47f0722..7f72f68 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "utils.h" #include "list.h" @@ -54,6 +55,16 @@ #include "hashtable.h" +#ifndef NO_SOCKETS +#if defined(HAVE_SYSTEMD) +#define XEN_SYSTEMD_ENABLED 1 +#endif +#endif + +#if defined(XEN_SYSTEMD_ENABLED) +#include +#endif + extern xc_evtchn *xce_handle; /* in xenstored_domain.c */ static int xce_pollfd_idx = -1; static struct pollfd *fds; @@ -1714,6 +1725,75 @@ static int destroy_fd(void *_fd) return 0; } +#if defined(XEN_SYSTEMD_ENABLED) +/* Will work regardless of the order systemd gives them to us */ +static int xs_get_sd_fd(const char *connect_to) +{ + int fd = SD_LISTEN_FDS_START; + int r; + + while (fd <= SD_LISTEN_FDS_START + 1) { + r = sd_is_socket_unix(fd, SOCK_STREAM, 1, connect_to, 0); + if (r > 0) + return fd; + fd++; + } + + return -EBADR; +} + +static int xs_validate_active_socket(const char *connect_to) +{ + if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) && + (strcmp("/var/run/xenstored/socket", connect_to) != 0)) { + sd_notifyf(0, "STATUS=unexpected socket: %s\n" + "ERRNO=%i", + connect_to, + EBADR); + return -EBADR; + } + + return xs_get_sd_fd(connect_to); +} + +static void xen_claim_active_sockets(int **psock, int **pro_sock) +{ + int *sock, *ro_sock; + const char *soc_str = xs_daemon_socket(); + const char *soc_str_ro = xs_daemon_socket_ro(); + int n; + + n = sd_listen_fds(0); + if (n <= 0) { + sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" + "ERRNO=%i", + strerror(errno), + errno); + barf_perror("sd_listen_fds() failed\n"); + } else if (n > 2) { + fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); + sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" + "ERRNO=%d", + strerror(EBADR), + EBADR); + barf_perror("sd_listen_fds() gave too many fds\n"); + } + + *psock = sock = talloc(talloc_autofree_context(), int); + *sock = xs_validate_active_socket(soc_str); + if (*sock <= 0) + barf_perror("%s", soc_str); + + *pro_sock = ro_sock = talloc(talloc_autofree_context(), int); + *ro_sock = xs_validate_active_socket(soc_str_ro); + if (*ro_sock <= 0) + barf_perror("%s", soc_str_ro); + + talloc_set_destructor(sock, destroy_fd); + talloc_set_destructor(ro_sock, destroy_fd); +} +#endif + static void init_sockets(int **psock, int **pro_sock) { struct sockaddr_un addr; @@ -1884,6 +1964,15 @@ int main(int argc, char *argv[]) if (optind != argc) barf("%s: No arguments desired", argv[0]); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) { + dofork = false; + if (pidfile) + barf("%s: PID file not needed on systemd", argv[0]); + pidfile = NULL; + } +#endif + reopen_log(); /* make sure xenstored directories exist */ @@ -1905,7 +1994,13 @@ int main(int argc, char *argv[]) /* Don't kill us with SIGPIPE. */ signal(SIGPIPE, SIG_IGN); - init_sockets(&sock, &ro_sock); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) + xen_claim_active_sockets(&sock, &ro_sock); + else +#endif + init_sockets(&sock, &ro_sock); + init_pipe(reopen_log_pipe); /* Setup the database */ @@ -1936,6 +2031,13 @@ int main(int argc, char *argv[]) /* Tell the kernel we're up and running. */ xenbus_notify_running(); +#if defined(XEN_SYSTEMD_ENABLED) + if (sd_booted()) { + sd_notify(1, "READY=1"); + fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + } +#endif + /* Main loop. */ for (;;) { struct connection *conn, *next; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1K-0008GK-KU; Mon, 28 Jul 2014 12:27:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1I-0008G1-Qb for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:13 +0000 Received: from [193.109.254.147:17702] by server-11.bemta-14.messagelabs.com id 36/60-14213-0A146D35; Mon, 28 Jul 2014 12:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1406550430!7583619!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27632 invoked from network); 28 Jul 2014 12:27:11 -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; 28 Jul 2014 12:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1F-0001Jk-Tv for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1F-0000t4-S8 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:09 +0000 Date: Mon, 28 Jul 2014 12:27:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: add support for systemd active sockets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9c1373347d67e8c68725aa7d6d298ca53bea98a Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:14 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 oxenstored: add support for systemd active sockets This adds systemd socket activation support for the Ocaml xenstored. Ocaml lacks systemd library support so we provide our own C helpers as is done with other functionality lacking on Ocaml. Active sockets enables oxenstored to be loaded only if required by a system onto which Xen is installed on. Socket activation is handled by systemd, once a port for a service which claims a socket is used systemd will start the required services for it, on demand. For more details on socket activation refer to Lennart's socket-activation post regarding this [0]. An important difference with socket activation is that systemd will set FD_CLOEXEC for us on the socket before giving it to us, we'll sprinkly the Unix.set_close_on_exec for LSB init next as a separate commit. Right now this code adds a no-op for this functionality, leaving the enablement to be done later once systemd is properly hooked into the build system. The socket activation is ordered in aligment with the socket activation order passed on to systemd. [0] http://0pointer.de/blog/projects/socket-activation2.html Cc: David Scott Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Vincent Hanquez Acked-by: Dave Scott Acked-by: Anil Madhavapeddy Signed-off-by: Luis R. Rodriguez --- tools/ocaml/xenstored/Makefile | 8 ++- tools/ocaml/xenstored/systemd.ml | 17 ++++ tools/ocaml/xenstored/systemd.mli | 24 +++++ tools/ocaml/xenstored/systemd_stubs.c | 152 +++++++++++++++++++++++++++++++++ tools/ocaml/xenstored/utils.ml | 20 +++-- tools/ocaml/xenstored/xenstored.ml | 2 + 6 files changed, 215 insertions(+), 8 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 7fa8f53..382a813 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -15,6 +15,11 @@ syslog_OBJS = syslog syslog_C_OBJS = syslog_stubs OCAML_LIBRARY = syslog +LIBS += systemd.cma systemd.cmxa +systemd_OBJS = systemd +systemd_C_OBJS = systemd_stubs +OCAML_LIBRARY += systemd + OBJS = define \ stdext \ trie \ @@ -36,11 +41,12 @@ OBJS = define \ process \ xenstored -INTF = symbol.cmi trie.cmi syslog.cmi +INTF = symbol.cmi trie.cmi syslog.cmi systemd.cmi XENSTOREDLIBS = \ unix.cmxa \ -ccopt -L -ccopt . syslog.cmxa \ + -ccopt -L -ccopt . systemd.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \ diff --git a/tools/ocaml/xenstored/systemd.ml b/tools/ocaml/xenstored/systemd.ml new file mode 100644 index 0000000..2aa39ea --- /dev/null +++ b/tools/ocaml/xenstored/systemd.ml @@ -0,0 +1,17 @@ +(* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +external sd_listen_fds: string -> Unix.file_descr = "ocaml_sd_listen_fds" +external sd_booted: unit -> bool = "ocaml_sd_booted" +external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd.mli b/tools/ocaml/xenstored/systemd.mli new file mode 100644 index 0000000..85c9f2e --- /dev/null +++ b/tools/ocaml/xenstored/systemd.mli @@ -0,0 +1,24 @@ +(* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +(** Calls the C library sd_listen_fds() function for us. Although + * the library doesn't accept argument we send one over to help + * us do sanity checks on the expected sockets *) +val sd_listen_fds: string -> Unix.file_descr + +(** Tells us whether or not systemd support was compiled in *) +val sd_booted: unit -> bool + +(** Tells systemd we're ready *) +external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c new file mode 100644 index 0000000..a368ac1 --- /dev/null +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(HAVE_SYSTEMD) + +#include +#include + +/* Will work regardless of the order systemd gives them to us */ +static int oxen_get_sd_fd(const char *connect_to) +{ + int fd = SD_LISTEN_FDS_START; + int r; + + while (fd <= SD_LISTEN_FDS_START + 1) { + r = sd_is_socket_unix(fd, SOCK_STREAM, 1, connect_to, 0); + if (r > 0) + return fd; + fd++; + } + + return -EBADR; +} + +static int oxen_verify_socket_socket(const char *connect_to) +{ + if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) && + (strcmp("/var/run/xenstored/socket", connect_to) != 0)) { + sd_notifyf(0, "STATUS=unexpected socket: %s\n" + "ERRNO=%i", + connect_to, + EBADR); + return -EBADR; + } + + return oxen_get_sd_fd(connect_to); +} + +CAMLprim value ocaml_sd_listen_fds(value connect_to) +{ + CAMLparam1(connect_to); + CAMLlocal1(sock_ret); + int sock = -EBADR, n; + + n = sd_listen_fds(0); + if (n <= 0) { + sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" + "ERRNO=%i", + strerror(errno), + errno); + caml_failwith("ocaml_sd_listen_fds() failed to get any sockets"); + } else if (n > 2) { + fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); + sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" + "ERRNO=%d", + strerror(EBADR), + EBADR); + caml_failwith("ocaml_sd_listen_fds() mismatch"); + } + + sock = oxen_verify_socket_socket(String_val(connect_to)); + if (sock <= 0) { + fprintf(stderr, "failed to verify sock %s\n", + String_val(connect_to)); + caml_failwith("ocaml_sd_listen_fds_init() invalid socket"); + } + + sock_ret = Val_int(sock); + + CAMLreturn(sock_ret); +} + +CAMLprim value ocaml_sd_booted(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_false; + + if (sd_booted()) + ret = Val_true; + + CAMLreturn(ret); +} + +CAMLprim value ocaml_sd_notify_ready(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_int(0); + + sd_notify(1, "READY=1"); + + CAMLreturn(ret); +} + +#else + +CAMLprim value ocaml_sd_listen_fds(value connect_to) +{ + CAMLparam1(connect_to); + CAMLlocal1(sock_ret); + + sock_ret = Val_int(-1); + + CAMLreturn(sock_ret); +} + +CAMLprim value ocaml_sd_booted(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_false; + + CAMLreturn(ret); +} + +CAMLprim value ocaml_sd_notify_ready(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_int(-1); + + CAMLreturn(ret); +} +#endif diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 68b70c5..0cfeded 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -73,14 +73,20 @@ let trim_path path = let join_by_null ls = String.concat "\000" ls (* unix utils *) +let create_regular_unix_socket name = + Unixext.unlink_safe name; + Unixext.mkdir_rec (Filename.dirname name) 0o700; + let sockaddr = Unix.ADDR_UNIX(name) in + let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in + Unix.bind sock sockaddr; + Unix.listen sock 1; + sock + let create_unix_socket name = - Unixext.unlink_safe name; - Unixext.mkdir_rec (Filename.dirname name) 0o700; - let sockaddr = Unix.ADDR_UNIX(name) in - let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in - Unix.bind sock sockaddr; - Unix.listen sock 1; - sock + if Systemd.sd_booted() then + Systemd.sd_listen_fds name + else + create_regular_unix_socket name let read_file_single_integer filename = let fd = Unix.openfile filename [ Unix.O_RDONLY ] 0o640 in diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 438ecb9..1c02f2f 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -383,6 +383,8 @@ let _ = while not !quit do try + if Systemd.sd_booted() then + Systemd.sd_notify_ready (); main_loop () with exc -> error "caught exception %s" (Printexc.to_string exc); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1K-0008GK-KU; Mon, 28 Jul 2014 12:27:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1I-0008G1-Qb for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:13 +0000 Received: from [193.109.254.147:17702] by server-11.bemta-14.messagelabs.com id 36/60-14213-0A146D35; Mon, 28 Jul 2014 12:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1406550430!7583619!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27632 invoked from network); 28 Jul 2014 12:27:11 -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; 28 Jul 2014 12:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1F-0001Jk-Tv for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1F-0000t4-S8 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:09 +0000 Date: Mon, 28 Jul 2014 12:27:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: add support for systemd active sockets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9c1373347d67e8c68725aa7d6d298ca53bea98a Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:14 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 oxenstored: add support for systemd active sockets This adds systemd socket activation support for the Ocaml xenstored. Ocaml lacks systemd library support so we provide our own C helpers as is done with other functionality lacking on Ocaml. Active sockets enables oxenstored to be loaded only if required by a system onto which Xen is installed on. Socket activation is handled by systemd, once a port for a service which claims a socket is used systemd will start the required services for it, on demand. For more details on socket activation refer to Lennart's socket-activation post regarding this [0]. An important difference with socket activation is that systemd will set FD_CLOEXEC for us on the socket before giving it to us, we'll sprinkly the Unix.set_close_on_exec for LSB init next as a separate commit. Right now this code adds a no-op for this functionality, leaving the enablement to be done later once systemd is properly hooked into the build system. The socket activation is ordered in aligment with the socket activation order passed on to systemd. [0] http://0pointer.de/blog/projects/socket-activation2.html Cc: David Scott Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Vincent Hanquez Acked-by: Dave Scott Acked-by: Anil Madhavapeddy Signed-off-by: Luis R. Rodriguez --- tools/ocaml/xenstored/Makefile | 8 ++- tools/ocaml/xenstored/systemd.ml | 17 ++++ tools/ocaml/xenstored/systemd.mli | 24 +++++ tools/ocaml/xenstored/systemd_stubs.c | 152 +++++++++++++++++++++++++++++++++ tools/ocaml/xenstored/utils.ml | 20 +++-- tools/ocaml/xenstored/xenstored.ml | 2 + 6 files changed, 215 insertions(+), 8 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 7fa8f53..382a813 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -15,6 +15,11 @@ syslog_OBJS = syslog syslog_C_OBJS = syslog_stubs OCAML_LIBRARY = syslog +LIBS += systemd.cma systemd.cmxa +systemd_OBJS = systemd +systemd_C_OBJS = systemd_stubs +OCAML_LIBRARY += systemd + OBJS = define \ stdext \ trie \ @@ -36,11 +41,12 @@ OBJS = define \ process \ xenstored -INTF = symbol.cmi trie.cmi syslog.cmi +INTF = symbol.cmi trie.cmi syslog.cmi systemd.cmi XENSTOREDLIBS = \ unix.cmxa \ -ccopt -L -ccopt . syslog.cmxa \ + -ccopt -L -ccopt . systemd.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \ diff --git a/tools/ocaml/xenstored/systemd.ml b/tools/ocaml/xenstored/systemd.ml new file mode 100644 index 0000000..2aa39ea --- /dev/null +++ b/tools/ocaml/xenstored/systemd.ml @@ -0,0 +1,17 @@ +(* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +external sd_listen_fds: string -> Unix.file_descr = "ocaml_sd_listen_fds" +external sd_booted: unit -> bool = "ocaml_sd_booted" +external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd.mli b/tools/ocaml/xenstored/systemd.mli new file mode 100644 index 0000000..85c9f2e --- /dev/null +++ b/tools/ocaml/xenstored/systemd.mli @@ -0,0 +1,24 @@ +(* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +(** Calls the C library sd_listen_fds() function for us. Although + * the library doesn't accept argument we send one over to help + * us do sanity checks on the expected sockets *) +val sd_listen_fds: string -> Unix.file_descr + +(** Tells us whether or not systemd support was compiled in *) +val sd_booted: unit -> bool + +(** Tells systemd we're ready *) +external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c new file mode 100644 index 0000000..a368ac1 --- /dev/null +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2014 Luis R. Rodriguez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(HAVE_SYSTEMD) + +#include +#include + +/* Will work regardless of the order systemd gives them to us */ +static int oxen_get_sd_fd(const char *connect_to) +{ + int fd = SD_LISTEN_FDS_START; + int r; + + while (fd <= SD_LISTEN_FDS_START + 1) { + r = sd_is_socket_unix(fd, SOCK_STREAM, 1, connect_to, 0); + if (r > 0) + return fd; + fd++; + } + + return -EBADR; +} + +static int oxen_verify_socket_socket(const char *connect_to) +{ + if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) && + (strcmp("/var/run/xenstored/socket", connect_to) != 0)) { + sd_notifyf(0, "STATUS=unexpected socket: %s\n" + "ERRNO=%i", + connect_to, + EBADR); + return -EBADR; + } + + return oxen_get_sd_fd(connect_to); +} + +CAMLprim value ocaml_sd_listen_fds(value connect_to) +{ + CAMLparam1(connect_to); + CAMLlocal1(sock_ret); + int sock = -EBADR, n; + + n = sd_listen_fds(0); + if (n <= 0) { + sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" + "ERRNO=%i", + strerror(errno), + errno); + caml_failwith("ocaml_sd_listen_fds() failed to get any sockets"); + } else if (n > 2) { + fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); + sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" + "ERRNO=%d", + strerror(EBADR), + EBADR); + caml_failwith("ocaml_sd_listen_fds() mismatch"); + } + + sock = oxen_verify_socket_socket(String_val(connect_to)); + if (sock <= 0) { + fprintf(stderr, "failed to verify sock %s\n", + String_val(connect_to)); + caml_failwith("ocaml_sd_listen_fds_init() invalid socket"); + } + + sock_ret = Val_int(sock); + + CAMLreturn(sock_ret); +} + +CAMLprim value ocaml_sd_booted(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_false; + + if (sd_booted()) + ret = Val_true; + + CAMLreturn(ret); +} + +CAMLprim value ocaml_sd_notify_ready(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_int(0); + + sd_notify(1, "READY=1"); + + CAMLreturn(ret); +} + +#else + +CAMLprim value ocaml_sd_listen_fds(value connect_to) +{ + CAMLparam1(connect_to); + CAMLlocal1(sock_ret); + + sock_ret = Val_int(-1); + + CAMLreturn(sock_ret); +} + +CAMLprim value ocaml_sd_booted(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_false; + + CAMLreturn(ret); +} + +CAMLprim value ocaml_sd_notify_ready(value ignore) +{ + CAMLparam1(ignore); + CAMLlocal1(ret); + + ret = Val_int(-1); + + CAMLreturn(ret); +} +#endif diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 68b70c5..0cfeded 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -73,14 +73,20 @@ let trim_path path = let join_by_null ls = String.concat "\000" ls (* unix utils *) +let create_regular_unix_socket name = + Unixext.unlink_safe name; + Unixext.mkdir_rec (Filename.dirname name) 0o700; + let sockaddr = Unix.ADDR_UNIX(name) in + let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in + Unix.bind sock sockaddr; + Unix.listen sock 1; + sock + let create_unix_socket name = - Unixext.unlink_safe name; - Unixext.mkdir_rec (Filename.dirname name) 0o700; - let sockaddr = Unix.ADDR_UNIX(name) in - let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in - Unix.bind sock sockaddr; - Unix.listen sock 1; - sock + if Systemd.sd_booted() then + Systemd.sd_listen_fds name + else + create_regular_unix_socket name let read_file_single_integer filename = let fd = Unix.openfile filename [ Unix.O_RDONLY ] 0o640 in diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 438ecb9..1c02f2f 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -383,6 +383,8 @@ let _ = while not !quit do try + if Systemd.sd_booted() then + Systemd.sd_notify_ready (); main_loop () with exc -> error "caught exception %s" (Printexc.to_string exc); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1U-0008I4-ND; Mon, 28 Jul 2014 12:27:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1T-0008Hq-AF for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:23 +0000 Received: from [85.158.143.35:28389] by server-2.bemta-4.messagelabs.com id 16/AF-04525-AA146D35; Mon, 28 Jul 2014 12:27:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1406550440!11577125!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7477 invoked from network); 28 Jul 2014 12:27:21 -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; 28 Jul 2014 12:27:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1Q-0001Jq-3J for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1Q-0000u4-0O for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:20 +0000 Date: Mon, 28 Jul 2014 12:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: force FD_CLOEXEC with Unix.set_close_on_exec on LSB 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 5be3f335e0d0dd1e449cdd23be3c37366c114b86 Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:15 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 oxenstored: force FD_CLOEXEC with Unix.set_close_on_exec on LSB init Lets match the systemd active socket activation implementation and ensure that FD_CLOEXEC is set by usin Unix.set_close_on_exec. David notes oxenstored likely does not exec but there is no harm in being careful just in case things change in the future. Cc: David Scott Cc: Anil Madhavapeddy Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Vincent Hanquez Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/ocaml/xenstored/utils.ml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 0cfeded..61321c6 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -78,6 +78,7 @@ let create_regular_unix_socket name = Unixext.mkdir_rec (Filename.dirname name) 0o700; let sockaddr = Unix.ADDR_UNIX(name) in let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in + Unix.set_close_on_exec sock; Unix.bind sock sockaddr; Unix.listen sock 1; sock -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1U-0008I4-ND; Mon, 28 Jul 2014 12:27:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1T-0008Hq-AF for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:23 +0000 Received: from [85.158.143.35:28389] by server-2.bemta-4.messagelabs.com id 16/AF-04525-AA146D35; Mon, 28 Jul 2014 12:27:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1406550440!11577125!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7477 invoked from network); 28 Jul 2014 12:27:21 -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; 28 Jul 2014 12:27:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1Q-0001Jq-3J for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1Q-0000u4-0O for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:20 +0000 Date: Mon, 28 Jul 2014 12:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: force FD_CLOEXEC with Unix.set_close_on_exec on LSB 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 5be3f335e0d0dd1e449cdd23be3c37366c114b86 Author: Luis R. Rodriguez AuthorDate: Thu Jul 17 16:28:15 2014 -0700 Commit: Ian Campbell CommitDate: Thu Jul 24 16:23:20 2014 +0100 oxenstored: force FD_CLOEXEC with Unix.set_close_on_exec on LSB init Lets match the systemd active socket activation implementation and ensure that FD_CLOEXEC is set by usin Unix.set_close_on_exec. David notes oxenstored likely does not exec but there is no harm in being careful just in case things change in the future. Cc: David Scott Cc: Anil Madhavapeddy Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Vincent Hanquez Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/ocaml/xenstored/utils.ml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 0cfeded..61321c6 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -78,6 +78,7 @@ let create_regular_unix_socket name = Unixext.mkdir_rec (Filename.dirname name) 0o700; let sockaddr = Unix.ADDR_UNIX(name) in let sock = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in + Unix.set_close_on_exec sock; Unix.bind sock sockaddr; Unix.listen sock 1; sock -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1e-0008Ja-R8; Mon, 28 Jul 2014 12:27:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1d-0008JN-Aa for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:33 +0000 Received: from [85.158.137.68:9831] by server-6.bemta-3.messagelabs.com id F5/42-29521-4B146D35; Mon, 28 Jul 2014 12:27:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1406550450!18382339!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5066 invoked from network); 28 Jul 2014 12:27:31 -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; 28 Jul 2014 12:27:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1a-0001K1-A5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1a-0000uW-7G for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:30 +0000 Date: Mon, 28 Jul 2014 12:27:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix ioreq-server event channel vulnerability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 125833f5f1f0403611bc762b3f1309bada138c54 Author: Paul Durrant AuthorDate: Fri Jul 25 11:51:57 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:51:57 2014 +0200 x86: fix ioreq-server event channel vulnerability The code in hvm_send_assist_req_to_ioreq_server() and hvm_do_resume() uses an event channel port number taken from the page of memory shared with the emulator. This allows an emulator to corrupt values that are then blindly used by Xen, leading to assertion failures in some cases. Moreover, in the case of the default ioreq server the page remains in the guest p2m so a malicious guest could similarly corrupt those values. This patch changes the afforementioned functions to get the event channel port number from an internal structure and also adds an extra check to hvm_send_assist_req_to_ioreq_server() which will crash the domain should the guest or an emulator corrupt the port number in the shared page. Reported-by: Wen Congyang Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/hvm.c | 113 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 51011ea..fba13e0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -392,6 +392,33 @@ bool_t hvm_io_pending(struct vcpu *v) return 0; } +static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) +{ + /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ + while ( p->state != STATE_IOREQ_NONE ) + { + switch ( p->state ) + { + case STATE_IORESP_READY: /* IORESP_READY -> NONE */ + rmb(); /* see IORESP_READY /then/ read contents of ioreq */ + hvm_io_assist(p); + break; + case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ + case STATE_IOREQ_INPROCESS: + wait_on_xen_event_channel(sv->ioreq_evtchn, + (p->state != STATE_IOREQ_READY) && + (p->state != STATE_IOREQ_INPROCESS)); + break; + default: + gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + domain_crash(sv->vcpu->domain); + return 0; /* bail */ + } + } + + return 1; +} + void hvm_do_resume(struct vcpu *v) { struct domain *d = v->domain; @@ -406,27 +433,18 @@ void hvm_do_resume(struct vcpu *v) &d->arch.hvm_domain.ioreq_server.list, list_entry ) { - ioreq_t *p = get_ioreq(s, v); + struct hvm_ioreq_vcpu *sv; - /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ - while ( p->state != STATE_IOREQ_NONE ) + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) { - switch ( p->state ) + if ( sv->vcpu == v ) { - case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - rmb(); /* see IORESP_READY /then/ read contents of ioreq */ - hvm_io_assist(p); - break; - case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ - case STATE_IOREQ_INPROCESS: - wait_on_xen_event_channel(p->vp_eport, - (p->state != STATE_IOREQ_READY) && - (p->state != STATE_IOREQ_INPROCESS)); + if ( !hvm_wait_for_io(sv, get_ioreq(s, v)) ) + return; + break; - default: - gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); - domain_crash(d); - return; /* bail */ } } } @@ -2545,35 +2563,58 @@ bool_t hvm_send_assist_req_to_ioreq_server(struct hvm_ioreq_server *s, { struct vcpu *curr = current; struct domain *d = curr->domain; - ioreq_t *p; + struct hvm_ioreq_vcpu *sv; if ( unlikely(!vcpu_start_shutdown_deferral(curr)) ) return 0; /* implicitly bins the i/o operation */ - p = get_ioreq(s, curr); - - if ( unlikely(p->state != STATE_IOREQ_NONE) ) + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) { - /* This indicates a bug in the device model. Crash the domain. */ - gdprintk(XENLOG_ERR, "Device model set bad IO state %d.\n", p->state); - domain_crash(d); - return 0; - } + if ( sv->vcpu == curr ) + { + evtchn_port_t port = sv->ioreq_evtchn; + ioreq_t *p = get_ioreq(s, curr); + + if ( unlikely(p->state != STATE_IOREQ_NONE) ) + { + gdprintk(XENLOG_ERR, + "Device model set bad IO state %d.\n", + p->state); + goto crash; + } + + if ( unlikely(p->vp_eport != port) ) + { + gdprintk(XENLOG_ERR, + "Device model set bad event channel %d.\n", + p->vp_eport); + goto crash; + } - proto_p->state = STATE_IOREQ_NONE; - proto_p->vp_eport = p->vp_eport; - *p = *proto_p; + proto_p->state = STATE_IOREQ_NONE; + proto_p->vp_eport = port; + *p = *proto_p; - prepare_wait_on_xen_event_channel(p->vp_eport); + prepare_wait_on_xen_event_channel(port); - /* - * Following happens /after/ blocking and setting up ioreq contents. - * prepare_wait_on_xen_event_channel() is an implicit barrier. - */ - p->state = STATE_IOREQ_READY; - notify_via_xen_event_channel(d, p->vp_eport); + /* + * Following happens /after/ blocking and setting up ioreq + * contents. prepare_wait_on_xen_event_channel() is an implicit + * barrier. + */ + p->state = STATE_IOREQ_READY; + notify_via_xen_event_channel(d, port); + break; + } + } return 1; + + crash: + domain_crash(d); + return 0; } bool_t hvm_send_assist_req(ioreq_t *p) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1e-0008Ja-R8; Mon, 28 Jul 2014 12:27:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1d-0008JN-Aa for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:33 +0000 Received: from [85.158.137.68:9831] by server-6.bemta-3.messagelabs.com id F5/42-29521-4B146D35; Mon, 28 Jul 2014 12:27:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1406550450!18382339!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5066 invoked from network); 28 Jul 2014 12:27:31 -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; 28 Jul 2014 12:27:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1a-0001K1-A5 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1a-0000uW-7G for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:30 +0000 Date: Mon, 28 Jul 2014 12:27:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix ioreq-server event channel vulnerability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 125833f5f1f0403611bc762b3f1309bada138c54 Author: Paul Durrant AuthorDate: Fri Jul 25 11:51:57 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:51:57 2014 +0200 x86: fix ioreq-server event channel vulnerability The code in hvm_send_assist_req_to_ioreq_server() and hvm_do_resume() uses an event channel port number taken from the page of memory shared with the emulator. This allows an emulator to corrupt values that are then blindly used by Xen, leading to assertion failures in some cases. Moreover, in the case of the default ioreq server the page remains in the guest p2m so a malicious guest could similarly corrupt those values. This patch changes the afforementioned functions to get the event channel port number from an internal structure and also adds an extra check to hvm_send_assist_req_to_ioreq_server() which will crash the domain should the guest or an emulator corrupt the port number in the shared page. Reported-by: Wen Congyang Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/hvm.c | 113 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 51011ea..fba13e0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -392,6 +392,33 @@ bool_t hvm_io_pending(struct vcpu *v) return 0; } +static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) +{ + /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ + while ( p->state != STATE_IOREQ_NONE ) + { + switch ( p->state ) + { + case STATE_IORESP_READY: /* IORESP_READY -> NONE */ + rmb(); /* see IORESP_READY /then/ read contents of ioreq */ + hvm_io_assist(p); + break; + case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ + case STATE_IOREQ_INPROCESS: + wait_on_xen_event_channel(sv->ioreq_evtchn, + (p->state != STATE_IOREQ_READY) && + (p->state != STATE_IOREQ_INPROCESS)); + break; + default: + gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + domain_crash(sv->vcpu->domain); + return 0; /* bail */ + } + } + + return 1; +} + void hvm_do_resume(struct vcpu *v) { struct domain *d = v->domain; @@ -406,27 +433,18 @@ void hvm_do_resume(struct vcpu *v) &d->arch.hvm_domain.ioreq_server.list, list_entry ) { - ioreq_t *p = get_ioreq(s, v); + struct hvm_ioreq_vcpu *sv; - /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ - while ( p->state != STATE_IOREQ_NONE ) + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) { - switch ( p->state ) + if ( sv->vcpu == v ) { - case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - rmb(); /* see IORESP_READY /then/ read contents of ioreq */ - hvm_io_assist(p); - break; - case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ - case STATE_IOREQ_INPROCESS: - wait_on_xen_event_channel(p->vp_eport, - (p->state != STATE_IOREQ_READY) && - (p->state != STATE_IOREQ_INPROCESS)); + if ( !hvm_wait_for_io(sv, get_ioreq(s, v)) ) + return; + break; - default: - gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); - domain_crash(d); - return; /* bail */ } } } @@ -2545,35 +2563,58 @@ bool_t hvm_send_assist_req_to_ioreq_server(struct hvm_ioreq_server *s, { struct vcpu *curr = current; struct domain *d = curr->domain; - ioreq_t *p; + struct hvm_ioreq_vcpu *sv; if ( unlikely(!vcpu_start_shutdown_deferral(curr)) ) return 0; /* implicitly bins the i/o operation */ - p = get_ioreq(s, curr); - - if ( unlikely(p->state != STATE_IOREQ_NONE) ) + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) { - /* This indicates a bug in the device model. Crash the domain. */ - gdprintk(XENLOG_ERR, "Device model set bad IO state %d.\n", p->state); - domain_crash(d); - return 0; - } + if ( sv->vcpu == curr ) + { + evtchn_port_t port = sv->ioreq_evtchn; + ioreq_t *p = get_ioreq(s, curr); + + if ( unlikely(p->state != STATE_IOREQ_NONE) ) + { + gdprintk(XENLOG_ERR, + "Device model set bad IO state %d.\n", + p->state); + goto crash; + } + + if ( unlikely(p->vp_eport != port) ) + { + gdprintk(XENLOG_ERR, + "Device model set bad event channel %d.\n", + p->vp_eport); + goto crash; + } - proto_p->state = STATE_IOREQ_NONE; - proto_p->vp_eport = p->vp_eport; - *p = *proto_p; + proto_p->state = STATE_IOREQ_NONE; + proto_p->vp_eport = port; + *p = *proto_p; - prepare_wait_on_xen_event_channel(p->vp_eport); + prepare_wait_on_xen_event_channel(port); - /* - * Following happens /after/ blocking and setting up ioreq contents. - * prepare_wait_on_xen_event_channel() is an implicit barrier. - */ - p->state = STATE_IOREQ_READY; - notify_via_xen_event_channel(d, p->vp_eport); + /* + * Following happens /after/ blocking and setting up ioreq + * contents. prepare_wait_on_xen_event_channel() is an implicit + * barrier. + */ + p->state = STATE_IOREQ_READY; + notify_via_xen_event_channel(d, port); + break; + } + } return 1; + + crash: + domain_crash(d); + return 0; } bool_t hvm_send_assist_req(ioreq_t *p) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1o-0008L9-Tl; Mon, 28 Jul 2014 12:27:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1n-0008Ko-2M for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:43 +0000 Received: from [85.158.137.68:4328] by server-1.bemta-3.messagelabs.com id FF/CB-30185-EB146D35; Mon, 28 Jul 2014 12:27:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1406550460!18454429!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7696 invoked from network); 28 Jul 2014 12:27:41 -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 Jul 2014 12:27:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1k-0001K7-FA for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1k-0000uy-E0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:40 +0000 Date: Mon, 28 Jul 2014 12:27:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{, un}pausevcpu hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:53:31 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:53:31 2014 +0200 x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper --- xen/arch/x86/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d62c715..243f42f 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1027,7 +1027,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( d->controller_pause_count > 0 ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1043,7 +1043,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( d->controller_pause_count > 0 ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1o-0008L9-Tl; Mon, 28 Jul 2014 12:27:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1n-0008Ko-2M for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:43 +0000 Received: from [85.158.137.68:4328] by server-1.bemta-3.messagelabs.com id FF/CB-30185-EB146D35; Mon, 28 Jul 2014 12:27:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1406550460!18454429!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7696 invoked from network); 28 Jul 2014 12:27:41 -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 Jul 2014 12:27:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1k-0001K7-FA for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1k-0000uy-E0 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:40 +0000 Date: Mon, 28 Jul 2014 12:27:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{, un}pausevcpu hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:53:31 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:53:31 2014 +0200 x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper --- xen/arch/x86/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d62c715..243f42f 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1027,7 +1027,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( d->controller_pause_count > 0 ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1043,7 +1043,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( d->controller_pause_count > 0 ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || -- generated by git-patchbot for /home/xen/git/xen.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 Jul 28 12:27:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1z-0008MY-0K; Mon, 28 Jul 2014 12:27:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1x-0008MF-91 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:53 +0000 Received: from [85.158.143.35:62522] by server-3.bemta-4.messagelabs.com id 60/42-06192-8C146D35; Mon, 28 Jul 2014 12:27:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1406550470!11874250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22111 invoked from network); 28 Jul 2014 12:27:51 -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; 28 Jul 2014 12:27:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1u-0001KD-Kl for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1u-0000vL-JC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:50 +0000 Date: Mon, 28 Jul 2014 12:27:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: introduce vcpu_{, un}pause_by_systemcontroller() helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 94483a5b758bbfc75e212aa499642c97985b3662 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:54:20 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:54:20 2014 +0200 common: introduce vcpu_{,un}pause_by_systemcontroller() helpers Which will be used by following patches. Reorder the function declarations for vcpu/domain pause/unpause to group by vcpu/domain and visually separate them slightly. Signed-off-by: Andrew Cooper --- xen/common/domain.c | 40 ++++++++++++++++++++++++++++++++++++++++ xen/include/xen/sched.h | 7 ++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index cd64aea..d7a84cf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -878,6 +878,46 @@ void vcpu_unpause(struct vcpu *v) vcpu_wake(v); } +int vcpu_pause_by_systemcontroller(struct vcpu *v) +{ + int old, new, prev = v->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&v->controller_pause_count, old, new); + } while ( prev != old ); + + vcpu_pause(v); + + return 0; +} + +int vcpu_unpause_by_systemcontroller(struct vcpu *v) +{ + int old, new, prev = v->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&v->controller_pause_count, old, new); + } while ( prev != old ); + + vcpu_unpause(v); + + return 0; +} + void domain_pause(struct domain *d) { struct vcpu *v; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 62a4785..67eb8f0 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -216,6 +216,8 @@ struct vcpu /* VCPU paused for mem_event replies. */ atomic_t mem_event_pause_count; + /* VCPU paused by system controller. */ + int controller_pause_count; /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; @@ -768,9 +770,12 @@ void vcpu_block(void); void vcpu_unblock(struct vcpu *v); void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); +void vcpu_unpause(struct vcpu *v); +int vcpu_pause_by_systemcontroller(struct vcpu *v); +int vcpu_unpause_by_systemcontroller(struct vcpu *v); + void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); -void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); int domain_unpause_by_systemcontroller(struct domain *d); int __domain_pause_by_systemcontroller(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 Mon Jul 28 12:27:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:27: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 1XBk1z-0008MY-0K; Mon, 28 Jul 2014 12:27:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1x-0008MF-91 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:53 +0000 Received: from [85.158.143.35:62522] by server-3.bemta-4.messagelabs.com id 60/42-06192-8C146D35; Mon, 28 Jul 2014 12:27:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1406550470!11874250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22111 invoked from network); 28 Jul 2014 12:27:51 -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; 28 Jul 2014 12:27:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk1u-0001KD-Kl for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk1u-0000vL-JC for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:27:50 +0000 Date: Mon, 28 Jul 2014 12:27:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: introduce vcpu_{, un}pause_by_systemcontroller() helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 94483a5b758bbfc75e212aa499642c97985b3662 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:54:20 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:54:20 2014 +0200 common: introduce vcpu_{,un}pause_by_systemcontroller() helpers Which will be used by following patches. Reorder the function declarations for vcpu/domain pause/unpause to group by vcpu/domain and visually separate them slightly. Signed-off-by: Andrew Cooper --- xen/common/domain.c | 40 ++++++++++++++++++++++++++++++++++++++++ xen/include/xen/sched.h | 7 ++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index cd64aea..d7a84cf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -878,6 +878,46 @@ void vcpu_unpause(struct vcpu *v) vcpu_wake(v); } +int vcpu_pause_by_systemcontroller(struct vcpu *v) +{ + int old, new, prev = v->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&v->controller_pause_count, old, new); + } while ( prev != old ); + + vcpu_pause(v); + + return 0; +} + +int vcpu_unpause_by_systemcontroller(struct vcpu *v) +{ + int old, new, prev = v->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&v->controller_pause_count, old, new); + } while ( prev != old ); + + vcpu_unpause(v); + + return 0; +} + void domain_pause(struct domain *d) { struct vcpu *v; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 62a4785..67eb8f0 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -216,6 +216,8 @@ struct vcpu /* VCPU paused for mem_event replies. */ atomic_t mem_event_pause_count; + /* VCPU paused by system controller. */ + int controller_pause_count; /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; @@ -768,9 +770,12 @@ void vcpu_block(void); void vcpu_unblock(struct vcpu *v); void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); +void vcpu_unpause(struct vcpu *v); +int vcpu_pause_by_systemcontroller(struct vcpu *v); +int vcpu_unpause_by_systemcontroller(struct vcpu *v); + void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); -void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); int domain_unpause_by_systemcontroller(struct domain *d); int __domain_pause_by_systemcontroller(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 Mon Jul 28 12:28:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:28: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 1XBk2A-0008O6-4e; Mon, 28 Jul 2014 12:28:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk27-0008Nj-Cu for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:05 +0000 Received: from [85.158.143.35:2188] by server-3.bemta-4.messagelabs.com id 47/72-06192-2D146D35; Mon, 28 Jul 2014 12:28:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550481!11889943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12429 invoked from network); 28 Jul 2014 12:28:02 -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; 28 Jul 2014 12:28:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk24-0001KM-Rf for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk24-0000vj-Q6 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:00 +0000 Date: Mon, 28 Jul 2014 12:28:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdbsx: security audit of {, un}pausevcpu and domstatus hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7d8ce78444dd8a5ee4d987745b6a4582ee43bf9 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:55:11 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:55:11 2014 +0200 x86/gdbsx: security audit of {,un}pausevcpu and domstatus hypercalls XEN_DOMCTL_gdbsx_domstatus is already safe. It loops at most over every vcpu in a domain and breaks at the first vcpu with an event pending, marking it as not-pending. XEN_DOMCTL_gdbsx_pausevcpu had an incorrect bounds check against the vcpu id, allowing an overflow of d->vcpu[] with an id between d->max_vcpus and MAX_VIRT_CPUS. It was also able to overflow a vcpus pause count by many repeated hypercalls. The bounds check is fixed, and vcpu_pause() has been replaced with vcpu_pause_by_systemcontroller() which cuts out at 255 uses. XEN_DOMCTL_gdbsx_unpausevcpu suffered from the same bounds problems as its pause counterpart, and is fixed in exactly the same way. Despite the atomic_read(&v->pause_count), this code didn't successfully prevent against an underflow of the vcpu pause count. The vcpu_unpause() has been replaced with vcpu_pause_by_systemcontroller() which correctly prevents against underflow. The printk() is updated to have a proper guest logging level, and provide more useful information in the XSM case of one domain having debugger privileges over another. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- docs/misc/xsm-flask.txt | 3 --- xen/arch/x86/domctl.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index 31b9d27..9559028 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -96,9 +96,6 @@ __HYPERVISOR_domctl (xen/include/public/domctl.h) * XEN_DOMCTL_set_broken_page_p2m * XEN_DOMCTL_setnodeaffinity * XEN_DOMCTL_gdbsx_guestmemio - * XEN_DOMCTL_gdbsx_pausevcpu - * XEN_DOMCTL_gdbsx_unpausevcpu - * XEN_DOMCTL_gdbsx_domstatus __HYPERVISOR_sysctl (xen/include/public/sysctl.h) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 243f42f..d1517c4 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1030,11 +1030,10 @@ long arch_do_domctl( if ( !d->controller_pause_count ) break; ret = -EINVAL; - if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || + if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) == NULL ) break; - vcpu_pause(v); - ret = 0; + ret = vcpu_pause_by_systemcontroller(v); } break; @@ -1046,13 +1045,14 @@ long arch_do_domctl( if ( !d->controller_pause_count ) break; ret = -EINVAL; - if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || + if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) == NULL ) break; - if ( !atomic_read(&v->pause_count) ) - printk("WARN: Unpausing vcpu:%d which is not paused\n", v->vcpu_id); - vcpu_unpause(v); - ret = 0; + ret = vcpu_unpause_by_systemcontroller(v); + if ( ret == -EINVAL ) + printk(XENLOG_G_WARNING + "WARN: d%d attempting to unpause %pv which is not paused\n", + current->domain->domain_id, v); } 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 Mon Jul 28 12:28:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:28: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 1XBk2A-0008O6-4e; Mon, 28 Jul 2014 12:28:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk27-0008Nj-Cu for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:05 +0000 Received: from [85.158.143.35:2188] by server-3.bemta-4.messagelabs.com id 47/72-06192-2D146D35; Mon, 28 Jul 2014 12:28:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406550481!11889943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12429 invoked from network); 28 Jul 2014 12:28:02 -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; 28 Jul 2014 12:28:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk24-0001KM-Rf for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk24-0000vj-Q6 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:00 +0000 Date: Mon, 28 Jul 2014 12:28:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdbsx: security audit of {, un}pausevcpu and domstatus hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7d8ce78444dd8a5ee4d987745b6a4582ee43bf9 Author: Andrew Cooper AuthorDate: Fri Jul 25 11:55:11 2014 +0200 Commit: Jan Beulich CommitDate: Fri Jul 25 11:55:11 2014 +0200 x86/gdbsx: security audit of {,un}pausevcpu and domstatus hypercalls XEN_DOMCTL_gdbsx_domstatus is already safe. It loops at most over every vcpu in a domain and breaks at the first vcpu with an event pending, marking it as not-pending. XEN_DOMCTL_gdbsx_pausevcpu had an incorrect bounds check against the vcpu id, allowing an overflow of d->vcpu[] with an id between d->max_vcpus and MAX_VIRT_CPUS. It was also able to overflow a vcpus pause count by many repeated hypercalls. The bounds check is fixed, and vcpu_pause() has been replaced with vcpu_pause_by_systemcontroller() which cuts out at 255 uses. XEN_DOMCTL_gdbsx_unpausevcpu suffered from the same bounds problems as its pause counterpart, and is fixed in exactly the same way. Despite the atomic_read(&v->pause_count), this code didn't successfully prevent against an underflow of the vcpu pause count. The vcpu_unpause() has been replaced with vcpu_pause_by_systemcontroller() which correctly prevents against underflow. The printk() is updated to have a proper guest logging level, and provide more useful information in the XSM case of one domain having debugger privileges over another. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- docs/misc/xsm-flask.txt | 3 --- xen/arch/x86/domctl.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index 31b9d27..9559028 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -96,9 +96,6 @@ __HYPERVISOR_domctl (xen/include/public/domctl.h) * XEN_DOMCTL_set_broken_page_p2m * XEN_DOMCTL_setnodeaffinity * XEN_DOMCTL_gdbsx_guestmemio - * XEN_DOMCTL_gdbsx_pausevcpu - * XEN_DOMCTL_gdbsx_unpausevcpu - * XEN_DOMCTL_gdbsx_domstatus __HYPERVISOR_sysctl (xen/include/public/sysctl.h) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 243f42f..d1517c4 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1030,11 +1030,10 @@ long arch_do_domctl( if ( !d->controller_pause_count ) break; ret = -EINVAL; - if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || + if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) == NULL ) break; - vcpu_pause(v); - ret = 0; + ret = vcpu_pause_by_systemcontroller(v); } break; @@ -1046,13 +1045,14 @@ long arch_do_domctl( if ( !d->controller_pause_count ) break; ret = -EINVAL; - if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || + if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) == NULL ) break; - if ( !atomic_read(&v->pause_count) ) - printk("WARN: Unpausing vcpu:%d which is not paused\n", v->vcpu_id); - vcpu_unpause(v); - ret = 0; + ret = vcpu_unpause_by_systemcontroller(v); + if ( ret == -EINVAL ) + printk(XENLOG_G_WARNING + "WARN: d%d attempting to unpause %pv which is not paused\n", + current->domain->domain_id, v); } 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 Mon Jul 28 12:28:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:28: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 1XBk2J-0008Pt-7B; Mon, 28 Jul 2014 12:28:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk2I-0008Pi-3L for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:14 +0000 Received: from [85.158.143.35:36429] by server-2.bemta-4.messagelabs.com id 7B/C0-04525-DD146D35; Mon, 28 Jul 2014 12:28:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1406550491!11925465!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32121 invoked from network); 28 Jul 2014 12:28: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; 28 Jul 2014 12:28:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk2F-0001Kv-20 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk2F-0000wI-0R for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:11 +0000 Date: Mon, 28 Jul 2014 12:28:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Select ramdisk bootmodule early enough when building 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 3925eaef085d287d43f7d213612c4f841e2dcb86 Author: Ian Campbell AuthorDate: Sat Jul 26 09:04:23 2014 +0100 Commit: Ian Campbell CommitDate: Sun Jul 27 09:40:15 2014 +0100 xen: arm: Select ramdisk bootmodule early enough when building dom0 I thought in 0040b649d6df "xen: arm: Only lookup kernel/initrd bootmodule once while building dom0" that I had identified place_modules as being soon enough, but I was wrong, since write_properties wants to use it sooner. Select the initrd boot module in kernel_probe at the same time we select the kernel to avoid all this. Signed-off-by: Ian Campbell --- xen/arch/arm/kernel.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index eaeadb5..d635a7e 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,7 +68,7 @@ static void place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = info->initrd_bootmodule; const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -116,7 +116,6 @@ static void place_modules(struct kernel_info *info, info->dtb_paddr = modbase; info->initrd_paddr = info->dtb_paddr + dtb_len; - info->initrd_bootmodule = mod; } static paddr_t kernel_zimage_place(struct kernel_info *info) @@ -390,6 +389,11 @@ int kernel_probe(struct kernel_info *info) printk("Loading kernel from boot module @ %"PRIpaddr"\n", start); + info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + if ( info->initrd_bootmodule ) + printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", + info->initrd_bootmodule->start); + #ifdef CONFIG_ARM_64 rc = kernel_zimage64_probe(info, start, size); if (rc < 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 Mon Jul 28 12:28:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Jul 2014 12:28: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 1XBk2J-0008Pt-7B; Mon, 28 Jul 2014 12:28:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk2I-0008Pi-3L for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:14 +0000 Received: from [85.158.143.35:36429] by server-2.bemta-4.messagelabs.com id 7B/C0-04525-DD146D35; Mon, 28 Jul 2014 12:28:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1406550491!11925465!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32121 invoked from network); 28 Jul 2014 12:28: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; 28 Jul 2014 12:28:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBk2F-0001Kv-20 for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XBk2F-0000wI-0R for xen-changelog@lists.xensource.com; Mon, 28 Jul 2014 12:28:11 +0000 Date: Mon, 28 Jul 2014 12:28:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Select ramdisk bootmodule early enough when building 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 3925eaef085d287d43f7d213612c4f841e2dcb86 Author: Ian Campbell AuthorDate: Sat Jul 26 09:04:23 2014 +0100 Commit: Ian Campbell CommitDate: Sun Jul 27 09:40:15 2014 +0100 xen: arm: Select ramdisk bootmodule early enough when building dom0 I thought in 0040b649d6df "xen: arm: Only lookup kernel/initrd bootmodule once while building dom0" that I had identified place_modules as being soon enough, but I was wrong, since write_properties wants to use it sooner. Select the initrd boot module in kernel_probe at the same time we select the kernel to avoid all this. Signed-off-by: Ian Campbell --- xen/arch/arm/kernel.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index eaeadb5..d635a7e 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,7 +68,7 @@ static void place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_RAMDISK); + const struct bootmodule *mod = info->initrd_bootmodule; const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); const paddr_t modsize = initrd_len + dtb_len; @@ -116,7 +116,6 @@ static void place_modules(struct kernel_info *info, info->dtb_paddr = modbase; info->initrd_paddr = info->dtb_paddr + dtb_len; - info->initrd_bootmodule = mod; } static paddr_t kernel_zimage_place(struct kernel_info *info) @@ -390,6 +389,11 @@ int kernel_probe(struct kernel_info *info) printk("Loading kernel from boot module @ %"PRIpaddr"\n", start); + info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + if ( info->initrd_bootmodule ) + printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", + info->initrd_bootmodule->start); + #ifdef CONFIG_ARM_64 rc = kernel_zimage64_probe(info, start, size); if (rc < 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 Wed Jul 30 09:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5J-0005pa-HV; Wed, 30 Jul 2014 09:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5I-0005pS-4w for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:08 +0000 Received: from [85.158.139.211:59461] by server-15.bemta-5.messagelabs.com id D3/4C-12002-F39B8D35; Wed, 30 Jul 2014 09:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1406712125!3231118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30268 invoked from network); 30 Jul 2014 09:22:06 -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; 30 Jul 2014 09:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5D-0004fX-Lj for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5D-0002Ty-5z for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:03 +0000 Date: Wed, 30 Jul 2014 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d880702dc3ee1b2ea999635583955303f3f03e0 Author: Jan Beulich AuthorDate: Mon Jul 28 14:50:45 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:50:45 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Wed Jul 30 09:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5J-0005pa-HV; Wed, 30 Jul 2014 09:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5I-0005pS-4w for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:08 +0000 Received: from [85.158.139.211:59461] by server-15.bemta-5.messagelabs.com id D3/4C-12002-F39B8D35; Wed, 30 Jul 2014 09:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1406712125!3231118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30268 invoked from network); 30 Jul 2014 09:22:06 -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; 30 Jul 2014 09:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5D-0004fX-Lj for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5D-0002Ty-5z for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:03 +0000 Date: Wed, 30 Jul 2014 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d880702dc3ee1b2ea999635583955303f3f03e0 Author: Jan Beulich AuthorDate: Mon Jul 28 14:50:45 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:50:45 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Wed Jul 30 09:22:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5U-0005qC-K7; Wed, 30 Jul 2014 09:22:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5S-0005q3-Uk for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:19 +0000 Received: from [85.158.143.35:58253] by server-3.bemta-4.messagelabs.com id 91/0A-06192-A49B8D35; Wed, 30 Jul 2014 09:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1406712136!12036530!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7084 invoked from network); 30 Jul 2014 09:22:17 -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; 30 Jul 2014 09:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5Q-0004fa-5B for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5P-0002UY-Ph for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:15 +0000 Date: Wed, 30 Jul 2014 09:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45981bb51f252e32d863ca52da65aafc1a1c6673 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:52:10 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:52:10 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 73613a6..a967b65 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1019,7 +1019,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1035,7 +1035,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1053,7 +1053,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index ac444ba..1308193 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -264,7 +264,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -680,18 +680,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -839,17 +834,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 7cf610a..060af1b 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -384,22 +384,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fb8bd36..3ae65e5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -338,7 +338,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -742,8 +742,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- 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 Jul 30 09:22:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5U-0005qC-K7; Wed, 30 Jul 2014 09:22:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5S-0005q3-Uk for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:19 +0000 Received: from [85.158.143.35:58253] by server-3.bemta-4.messagelabs.com id 91/0A-06192-A49B8D35; Wed, 30 Jul 2014 09:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1406712136!12036530!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7084 invoked from network); 30 Jul 2014 09:22:17 -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; 30 Jul 2014 09:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5Q-0004fa-5B for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5P-0002UY-Ph for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:15 +0000 Date: Wed, 30 Jul 2014 09:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45981bb51f252e32d863ca52da65aafc1a1c6673 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:52:10 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:52:10 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 73613a6..a967b65 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1019,7 +1019,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1035,7 +1035,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1053,7 +1053,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index ac444ba..1308193 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -264,7 +264,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -680,18 +680,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -839,17 +834,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 7cf610a..060af1b 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -384,22 +384,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fb8bd36..3ae65e5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -338,7 +338,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -742,8 +742,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- 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 Jul 30 09:22:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5e-0005rU-Ml; Wed, 30 Jul 2014 09:22:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5c-0005rG-SX for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:28 +0000 Received: from [193.109.254.147:61068] by server-1.bemta-14.messagelabs.com id 9D/BC-24760-459B8D35; Wed, 30 Jul 2014 09:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1406712146!12548411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22274 invoked from network); 30 Jul 2014 09:22:27 -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; 30 Jul 2014 09:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5a-0004fj-BI for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5a-0002V1-9O for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:26 +0000 Date: Wed, 30 Jul 2014 09:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77e8f6f5e9652d0ea1ca868f58f7ea1cbbc9da33 Author: Juergen Gross AuthorDate: Mon Jul 28 14:53:22 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:53:22 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 933de78..e46e930 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -471,12 +471,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- 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 Jul 30 09:22:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5e-0005rU-Ml; Wed, 30 Jul 2014 09:22:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5c-0005rG-SX for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:28 +0000 Received: from [193.109.254.147:61068] by server-1.bemta-14.messagelabs.com id 9D/BC-24760-459B8D35; Wed, 30 Jul 2014 09:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1406712146!12548411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22274 invoked from network); 30 Jul 2014 09:22:27 -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; 30 Jul 2014 09:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5a-0004fj-BI for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5a-0002V1-9O for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:26 +0000 Date: Wed, 30 Jul 2014 09:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77e8f6f5e9652d0ea1ca868f58f7ea1cbbc9da33 Author: Juergen Gross AuthorDate: Mon Jul 28 14:53:22 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:53:22 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 933de78..e46e930 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -471,12 +471,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- 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 Jul 30 09:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5n-0005sl-PR; Wed, 30 Jul 2014 09:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5n-0005sc-0J for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:39 +0000 Received: from [85.158.139.211:37684] by server-5.bemta-5.messagelabs.com id 6B/38-11546-E59B8D35; Wed, 30 Jul 2014 09:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406712156!10814910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23781 invoked from network); 30 Jul 2014 09:22:37 -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; 30 Jul 2014 09:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5k-0004fr-H3 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5k-0002VZ-F6 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:36 +0000 Date: Wed, 30 Jul 2014 09:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff7d723972838b20c86e01d013f1b86f850e6e94 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:54:15 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:54:15 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 9a80e0b..6d83e0f 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e0e5840..f3f4a3d 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1228,8 +1228,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1248,7 +1257,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1356,11 +1365,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- 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 Jul 30 09:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5n-0005sl-PR; Wed, 30 Jul 2014 09:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5n-0005sc-0J for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:39 +0000 Received: from [85.158.139.211:37684] by server-5.bemta-5.messagelabs.com id 6B/38-11546-E59B8D35; Wed, 30 Jul 2014 09:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406712156!10814910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23781 invoked from network); 30 Jul 2014 09:22:37 -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; 30 Jul 2014 09:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5k-0004fr-H3 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5k-0002VZ-F6 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:36 +0000 Date: Wed, 30 Jul 2014 09:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff7d723972838b20c86e01d013f1b86f850e6e94 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:54:15 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:54:15 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 9a80e0b..6d83e0f 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e0e5840..f3f4a3d 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1228,8 +1228,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1248,7 +1257,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1356,11 +1365,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- 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 Jul 30 09:22:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5y-0005uO-SO; Wed, 30 Jul 2014 09:22:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5x-0005u0-73 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:49 +0000 Received: from [85.158.139.211:18045] by server-6.bemta-5.messagelabs.com id 2B/7A-06284-869B8D35; Wed, 30 Jul 2014 09:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1406712166!10837069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22734 invoked from network); 30 Jul 2014 09:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Jul 2014 09:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5u-0004fx-NT for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5u-0002Vv-Kb for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:46 +0000 Date: Wed, 30 Jul 2014 09:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: eliminate 64k ports limitation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 798074a40475fd4c064accb77a2d5dd7daede861 Author: Jan Beulich AuthorDate: Mon Jul 28 14:56:33 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:56:33 2014 +0200 evtchn: eliminate 64k ports limitation The introduction of FIFO event channels claimed to support over 100k ports, but failed to widen a number of 16-bit variables/operations. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel Acked-by: Keir Fraser master commit: 8f7f6ab879a9ad9d2bf66b8c6b46a0653086b79f master date: 2014-04-11 11:25:56 +0200 --- xen/common/event_channel.c | 4 ++-- xen/include/xen/sched.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index db952af..6fd4a2c 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -275,12 +275,12 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) goto out; lchn->u.interdomain.remote_dom = rd; - lchn->u.interdomain.remote_port = (u16)rport; + lchn->u.interdomain.remote_port = rport; lchn->state = ECS_INTERDOMAIN; evtchn_port_init(ld, lchn); rchn->u.interdomain.remote_dom = ld; - rchn->u.interdomain.remote_port = (u16)lport; + rchn->u.interdomain.remote_port = lport; rchn->state = ECS_INTERDOMAIN; /* diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3ae65e5..4171ba8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -86,13 +86,13 @@ struct evtchn domid_t remote_domid; } unbound; /* state == ECS_UNBOUND */ struct { - u16 remote_port; + evtchn_port_t remote_port; struct domain *remote_dom; } interdomain; /* state == ECS_INTERDOMAIN */ struct { - u16 irq; - u16 next_port; - u16 prev_port; + u32 irq; + evtchn_port_t next_port; + evtchn_port_t prev_port; } pirq; /* state == ECS_PIRQ */ u16 virq; /* state == ECS_VIRQ */ } u; @@ -190,7 +190,7 @@ struct vcpu atomic_t pause_count; /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ - u16 virq_to_evtchn[NR_VIRQS]; + evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; /* Bitmask of CPUs on which this VCPU may run. */ -- 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 Jul 30 09:22:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:22: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 1XCQ5y-0005uO-SO; Wed, 30 Jul 2014 09:22:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5x-0005u0-73 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:49 +0000 Received: from [85.158.139.211:18045] by server-6.bemta-5.messagelabs.com id 2B/7A-06284-869B8D35; Wed, 30 Jul 2014 09:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1406712166!10837069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22734 invoked from network); 30 Jul 2014 09:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Jul 2014 09:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ5u-0004fx-NT for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ5u-0002Vv-Kb for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:46 +0000 Date: Wed, 30 Jul 2014 09:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: eliminate 64k ports limitation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 798074a40475fd4c064accb77a2d5dd7daede861 Author: Jan Beulich AuthorDate: Mon Jul 28 14:56:33 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:56:33 2014 +0200 evtchn: eliminate 64k ports limitation The introduction of FIFO event channels claimed to support over 100k ports, but failed to widen a number of 16-bit variables/operations. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel Acked-by: Keir Fraser master commit: 8f7f6ab879a9ad9d2bf66b8c6b46a0653086b79f master date: 2014-04-11 11:25:56 +0200 --- xen/common/event_channel.c | 4 ++-- xen/include/xen/sched.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index db952af..6fd4a2c 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -275,12 +275,12 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) goto out; lchn->u.interdomain.remote_dom = rd; - lchn->u.interdomain.remote_port = (u16)rport; + lchn->u.interdomain.remote_port = rport; lchn->state = ECS_INTERDOMAIN; evtchn_port_init(ld, lchn); rchn->u.interdomain.remote_dom = ld; - rchn->u.interdomain.remote_port = (u16)lport; + rchn->u.interdomain.remote_port = lport; rchn->state = ECS_INTERDOMAIN; /* diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3ae65e5..4171ba8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -86,13 +86,13 @@ struct evtchn domid_t remote_domid; } unbound; /* state == ECS_UNBOUND */ struct { - u16 remote_port; + evtchn_port_t remote_port; struct domain *remote_dom; } interdomain; /* state == ECS_INTERDOMAIN */ struct { - u16 irq; - u16 next_port; - u16 prev_port; + u32 irq; + evtchn_port_t next_port; + evtchn_port_t prev_port; } pirq; /* state == ECS_PIRQ */ u16 virq; /* state == ECS_VIRQ */ } u; @@ -190,7 +190,7 @@ struct vcpu atomic_t pause_count; /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ - u16 virq_to_evtchn[NR_VIRQS]; + evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; /* Bitmask of CPUs on which this VCPU may run. */ -- 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 Jul 30 09:23:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:23: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 1XCQ69-0005wi-ES; Wed, 30 Jul 2014 09:23:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ67-0005wC-P8 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:59 +0000 Received: from [85.158.137.68:32835] by server-8.bemta-3.messagelabs.com id A5/12-31195-379B8D35; Wed, 30 Jul 2014 09:22:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406712177!7073659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10351 invoked from network); 30 Jul 2014 09:22:58 -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; 30 Jul 2014 09:22:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ64-0004gA-UC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ64-0002Wn-SW for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:56 +0000 Date: Wed, 30 Jul 2014 09:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 431363765c1bc6e3a24e549e8344b1ff63a1e420 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:57:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:57:47 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index eefa968..25f7599 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4704,7 +4704,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d00e404..909d7a4 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -655,6 +655,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 6d83e0f..11df871 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f3f4a3d..246ddd7 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1094,7 +1094,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1257,7 +1257,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1352,7 +1352,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1378,7 +1378,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4171ba8..4418883 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -189,6 +189,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- 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 Jul 30 09:23:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:23: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 1XCQ69-0005wi-ES; Wed, 30 Jul 2014 09:23:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ67-0005wC-P8 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:59 +0000 Received: from [85.158.137.68:32835] by server-8.bemta-3.messagelabs.com id A5/12-31195-379B8D35; Wed, 30 Jul 2014 09:22:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1406712177!7073659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10351 invoked from network); 30 Jul 2014 09:22:58 -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; 30 Jul 2014 09:22:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ64-0004gA-UC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ64-0002Wn-SW for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:22:56 +0000 Date: Wed, 30 Jul 2014 09:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 431363765c1bc6e3a24e549e8344b1ff63a1e420 Author: Andrew Cooper AuthorDate: Mon Jul 28 14:57:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:57:47 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index eefa968..25f7599 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4704,7 +4704,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d00e404..909d7a4 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -655,6 +655,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 6d83e0f..11df871 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f3f4a3d..246ddd7 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1094,7 +1094,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1257,7 +1257,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1352,7 +1352,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1378,7 +1378,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4171ba8..4418883 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -189,6 +189,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ evtchn_port_t virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- 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 Jul 30 09:23:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:23: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 1XCQ6K-0005yh-HW; Wed, 30 Jul 2014 09:23:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ6J-0005yQ-Ae for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:11 +0000 Received: from [85.158.143.35:63352] by server-3.bemta-4.messagelabs.com id 37/AB-06192-E79B8D35; Wed, 30 Jul 2014 09:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1406712187!12408760!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6280 invoked from network); 30 Jul 2014 09:23: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; 30 Jul 2014 09:23:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ6F-0004gj-4F for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ6F-0002XK-23 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:07 +0000 Date: Wed, 30 Jul 2014 09:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aed51c25dc38ab2743476d7a8f5ba6604b52a4cf Author: Tamas K Lengyel AuthorDate: Mon Jul 28 14:59:00 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:59:00 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 25f7599..be1a2d3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1926,6 +1926,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- 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 Jul 30 09:23:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 09:23: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 1XCQ6K-0005yh-HW; Wed, 30 Jul 2014 09:23:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ6J-0005yQ-Ae for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:11 +0000 Received: from [85.158.143.35:63352] by server-3.bemta-4.messagelabs.com id 37/AB-06192-E79B8D35; Wed, 30 Jul 2014 09:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1406712187!12408760!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6280 invoked from network); 30 Jul 2014 09:23: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; 30 Jul 2014 09:23:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCQ6F-0004gj-4F for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCQ6F-0002XK-23 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 09:23:07 +0000 Date: Wed, 30 Jul 2014 09:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aed51c25dc38ab2743476d7a8f5ba6604b52a4cf Author: Tamas K Lengyel AuthorDate: Mon Jul 28 14:59:00 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 14:59:00 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 25f7599..be1a2d3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1926,6 +1926,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- 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 Jul 30 17:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXZn-0000pV-NK; Wed, 30 Jul 2014 17:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZm-0000pQ-K6 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:06 +0000 Received: from [85.158.143.35:9845] by server-1.bemta-4.messagelabs.com id 7D/1F-05872-DB929D35; Wed, 30 Jul 2014 17:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1406740924!12501066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9061 invoked from network); 30 Jul 2014 17:22:05 -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; 30 Jul 2014 17:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZk-0001n7-6X for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXZj-00026R-MC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:03 +0000 Date: Wed, 30 Jul 2014 17:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f80eb055b030f95772ce313bb037a92bea7ceec2 Author: Jan Beulich AuthorDate: Mon Jul 28 15:09:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:09:47 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Wed Jul 30 17:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXZn-0000pV-NK; Wed, 30 Jul 2014 17:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZm-0000pQ-K6 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:06 +0000 Received: from [85.158.143.35:9845] by server-1.bemta-4.messagelabs.com id 7D/1F-05872-DB929D35; Wed, 30 Jul 2014 17:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1406740924!12501066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9061 invoked from network); 30 Jul 2014 17:22:05 -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; 30 Jul 2014 17:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZk-0001n7-6X for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXZj-00026R-MC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:03 +0000 Date: Wed, 30 Jul 2014 17:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f80eb055b030f95772ce313bb037a92bea7ceec2 Author: Jan Beulich AuthorDate: Mon Jul 28 15:09:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:09:47 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + 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 Wed Jul 30 17:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXZy-0000qK-QD; Wed, 30 Jul 2014 17:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZx-0000qC-FR for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:17 +0000 Received: from [85.158.143.35:19373] by server-3.bemta-4.messagelabs.com id 9A/73-06192-8C929D35; Wed, 30 Jul 2014 17:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1406740935!12485935!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17000 invoked from network); 30 Jul 2014 17:22:15 -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; 30 Jul 2014 17:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZu-0001nA-Q0 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXZu-00026s-Ae for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:14 +0000 Date: Wed, 30 Jul 2014 17:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62a5c8a6221d1e453b466059758400fa9e30ffa6 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:10:41 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:10:41 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 10 ++----- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index bb80b23..48de4bf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1306,7 +1306,7 @@ long arch_do_domctl( break; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) { rcu_unlock_domain(d); break; @@ -1334,7 +1334,7 @@ long arch_do_domctl( break; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) { rcu_unlock_domain(d); break; @@ -1364,7 +1364,7 @@ long arch_do_domctl( break; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1fde261..73842f9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -257,7 +257,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -621,18 +621,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -779,17 +774,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index b3bfb38..0ad3f75 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -144,7 +144,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -363,10 +363,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } + ret = domain_pause_by_systemcontroller(d); pausedomain_out: rcu_unlock_domain(d); } @@ -388,9 +385,8 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) break; } - domain_unpause_by_systemcontroller(d); + ret = domain_unpause_by_systemcontroller(d); rcu_unlock_domain(d); - ret = 0; } break; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0ab0fb4..d04e96b 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -283,7 +283,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -662,8 +662,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- 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 Jul 30 17:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXZy-0000qK-QD; Wed, 30 Jul 2014 17:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZx-0000qC-FR for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:17 +0000 Received: from [85.158.143.35:19373] by server-3.bemta-4.messagelabs.com id 9A/73-06192-8C929D35; Wed, 30 Jul 2014 17:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1406740935!12485935!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17000 invoked from network); 30 Jul 2014 17:22:15 -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; 30 Jul 2014 17:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXZu-0001nA-Q0 for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXZu-00026s-Ae for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:14 +0000 Date: Wed, 30 Jul 2014 17:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62a5c8a6221d1e453b466059758400fa9e30ffa6 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:10:41 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:10:41 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 10 ++----- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index bb80b23..48de4bf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1306,7 +1306,7 @@ long arch_do_domctl( break; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) { rcu_unlock_domain(d); break; @@ -1334,7 +1334,7 @@ long arch_do_domctl( break; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) { rcu_unlock_domain(d); break; @@ -1364,7 +1364,7 @@ long arch_do_domctl( break; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1fde261..73842f9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -257,7 +257,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -621,18 +621,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -779,17 +774,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index b3bfb38..0ad3f75 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -144,7 +144,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -363,10 +363,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } + ret = domain_pause_by_systemcontroller(d); pausedomain_out: rcu_unlock_domain(d); } @@ -388,9 +385,8 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) break; } - domain_unpause_by_systemcontroller(d); + ret = domain_unpause_by_systemcontroller(d); rcu_unlock_domain(d); - ret = 0; } break; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0ab0fb4..d04e96b 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -283,7 +283,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -662,8 +662,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(struct domain *d); +int domain_unpause_by_systemcontroller(struct domain *d); +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)); +static inline int domain_pause_by_systemcontroller(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause); +} +static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return __domain_pause_by_systemcontroller(d, domain_pause_nosync); +} void cpu_init(void); struct scheduler; -- 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 Jul 30 17:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXa8-0000rd-Su; Wed, 30 Jul 2014 17:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXa7-0000rS-HC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:27 +0000 Received: from [85.158.143.35:21937] by server-1.bemta-4.messagelabs.com id 0B/4F-05872-2D929D35; Wed, 30 Jul 2014 17:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1406740945!12506965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30630 invoked from network); 30 Jul 2014 17:22:26 -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; 30 Jul 2014 17:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXa4-0001nM-Vm for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXa4-00027S-Tc for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:24 +0000 Date: Wed, 30 Jul 2014 17:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86d62cebf3c0c98bbd62f2bd247910d553fbb80d Author: Juergen Gross AuthorDate: Mon Jul 28 15:11:21 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:11:21 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 637f56c..255d5c9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -465,12 +465,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- 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 Jul 30 17:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXa8-0000rd-Su; Wed, 30 Jul 2014 17:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXa7-0000rS-HC for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:27 +0000 Received: from [85.158.143.35:21937] by server-1.bemta-4.messagelabs.com id 0B/4F-05872-2D929D35; Wed, 30 Jul 2014 17:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1406740945!12506965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30630 invoked from network); 30 Jul 2014 17:22:26 -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; 30 Jul 2014 17:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXa4-0001nM-Vm for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXa4-00027S-Tc for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:24 +0000 Date: Wed, 30 Jul 2014 17:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86d62cebf3c0c98bbd62f2bd247910d553fbb80d Author: Juergen Gross AuthorDate: Mon Jul 28 15:11:21 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:11:21 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 637f56c..255d5c9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -465,12 +465,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- 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 Jul 30 17:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXaI-0000tE-VS; Wed, 30 Jul 2014 17:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaH-0000sy-NH for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:37 +0000 Received: from [193.109.254.147:32839] by server-10.bemta-14.messagelabs.com id 20/D9-06615-DD929D35; Wed, 30 Jul 2014 17:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406740955!12771554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24583 invoked from network); 30 Jul 2014 17:22: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; 30 Jul 2014 17:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaF-0001nU-5T for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaF-00028b-3x for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:35 +0000 Date: Wed, 30 Jul 2014 17:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48b7f833834644d0f6a08c9234393ed06ddddb1f Author: Tamas K Lengyel AuthorDate: Mon Jul 28 15:14:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:14:43 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7d4b0b3..8959a54 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1788,6 +1788,7 @@ int hvm_set_cr0(unsigned long value) v->arch.hvm_vcpu.guest_cr[0] = value; hvm_update_guest_cr(v, 0); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- 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 Jul 30 17:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXaI-0000tE-VS; Wed, 30 Jul 2014 17:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaH-0000sy-NH for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:37 +0000 Received: from [193.109.254.147:32839] by server-10.bemta-14.messagelabs.com id 20/D9-06615-DD929D35; Wed, 30 Jul 2014 17:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406740955!12771554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24583 invoked from network); 30 Jul 2014 17:22: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; 30 Jul 2014 17:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaF-0001nU-5T for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaF-00028b-3x for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:35 +0000 Date: Wed, 30 Jul 2014 17:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48b7f833834644d0f6a08c9234393ed06ddddb1f Author: Tamas K Lengyel AuthorDate: Mon Jul 28 15:14:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:14:43 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7d4b0b3..8959a54 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1788,6 +1788,7 @@ int hvm_set_cr0(unsigned long value) v->arch.hvm_vcpu.guest_cr[0] = value; hvm_update_guest_cr(v, 0); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- 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 Jul 30 17:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXaT-0000uh-1m; Wed, 30 Jul 2014 17:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaR-0000uS-OE for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:47 +0000 Received: from [193.109.254.147:33387] by server-8.bemta-14.messagelabs.com id C8/4C-07074-7E929D35; Wed, 30 Jul 2014 17:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1406740965!12763565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13107 invoked from network); 30 Jul 2014 17:22:46 -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; 30 Jul 2014 17:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaP-0001na-AT for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaP-00028y-8v for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:45 +0000 Date: Wed, 30 Jul 2014 17:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1d8b364c5e90295263d77f0da14127d4197b585 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:15:21 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:15:21 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 09703a1..f04034d 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -595,11 +595,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index afc6319..1619a79 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1211,8 +1211,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1231,7 +1240,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1328,11 +1337,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- 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 Jul 30 17:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:22: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 1XCXaT-0000uh-1m; Wed, 30 Jul 2014 17:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaR-0000uS-OE for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:47 +0000 Received: from [193.109.254.147:33387] by server-8.bemta-14.messagelabs.com id C8/4C-07074-7E929D35; Wed, 30 Jul 2014 17:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1406740965!12763565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13107 invoked from network); 30 Jul 2014 17:22:46 -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; 30 Jul 2014 17:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaP-0001na-AT for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaP-00028y-8v for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:45 +0000 Date: Wed, 30 Jul 2014 17:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1d8b364c5e90295263d77f0da14127d4197b585 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:15:21 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:15:21 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 09703a1..f04034d 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -595,11 +595,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index afc6319..1619a79 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1211,8 +1211,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1231,7 +1240,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1328,11 +1337,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- 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 Jul 30 17:23:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:23: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 1XCXag-0000xA-Iu; Wed, 30 Jul 2014 17:23:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXad-0000wn-De for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:59 +0000 Received: from [85.158.139.211:15511] by server-15.bemta-5.messagelabs.com id E7/75-12002-2F929D35; Wed, 30 Jul 2014 17:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406740975!10932504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17178 invoked from network); 30 Jul 2014 17:22:56 -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; 30 Jul 2014 17:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaZ-0001nj-GJ for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaZ-00029N-Du for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:55 +0000 Date: Wed, 30 Jul 2014 17:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5ae5ee39a34cd5894fc5d0456aeec96735141a5 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:16:19 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:16:19 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8959a54..153b89a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4532,7 +4532,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d728889..1123c9f 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -672,6 +672,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index f04034d..d1a9130 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -567,7 +567,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -608,7 +608,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1619a79..1146f81 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1077,7 +1077,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1240,7 +1240,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1324,7 +1324,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1350,7 +1350,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 23d71c1..f5890bd 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -67,6 +67,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d04e96b..e9af8e2 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -157,6 +157,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ u16 virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- 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 Jul 30 17:23:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 30 Jul 2014 17:23: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 1XCXag-0000xA-Iu; Wed, 30 Jul 2014 17:23:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXad-0000wn-De for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:59 +0000 Received: from [85.158.139.211:15511] by server-15.bemta-5.messagelabs.com id E7/75-12002-2F929D35; Wed, 30 Jul 2014 17:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1406740975!10932504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17178 invoked from network); 30 Jul 2014 17:22:56 -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; 30 Jul 2014 17:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCXaZ-0001nj-GJ for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCXaZ-00029N-Du for xen-changelog@lists.xensource.com; Wed, 30 Jul 2014 17:22:55 +0000 Date: Wed, 30 Jul 2014 17:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5ae5ee39a34cd5894fc5d0456aeec96735141a5 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:16:19 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:16:19 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8959a54..153b89a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4532,7 +4532,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d728889..1123c9f 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -672,6 +672,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index f04034d..d1a9130 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -567,7 +567,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -608,7 +608,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1619a79..1146f81 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1077,7 +1077,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1240,7 +1240,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1324,7 +1324,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1350,7 +1350,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 23d71c1..f5890bd 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -67,6 +67,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d04e96b..e9af8e2 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -157,6 +157,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ u16 virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- 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 Jul 31 17:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:44: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 1XCuOd-0008DB-Bf; Thu, 31 Jul 2014 17:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOc-0008Cy-7p for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:06 +0000 Received: from [193.109.254.147:5812] by server-4.bemta-14.messagelabs.com id 81/97-23592-5608AD35; Thu, 31 Jul 2014 17:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406828644!13021256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27278 invoked from network); 31 Jul 2014 17:44:05 -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; 31 Jul 2014 17:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOZ-0000O8-MX for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOZ-0002Oh-Ag for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:03 +0000 Date: Thu, 31 Jul 2014 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: export do_yield as vcpu_yield X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afac868e50ace7e89fcf87d4f079d2185ea4b738 Author: Stefano Stabellini AuthorDate: Wed Jul 23 14:37:22 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:15 2014 +0100 xen: export do_yield as vcpu_yield Signed-off-by: Stefano Stabellini Acked-by: George Dunlap CC: JBeulich@suse.com --- xen/common/schedule.c | 6 +++--- xen/include/xen/sched.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index e9eb0bc..9a49769 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -795,7 +795,7 @@ static long do_poll(struct sched_poll *sched_poll) } /* Voluntarily yield the processor for this allocation. */ -static long do_yield(void) +long vcpu_yield(void) { struct vcpu * v=current; spinlock_t *lock = vcpu_schedule_lock_irq(v); @@ -888,7 +888,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } @@ -925,7 +925,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 67eb8f0..4575dda 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -639,6 +639,7 @@ int sched_id(void); void sched_tick_suspend(void); void sched_tick_resume(void); void vcpu_wake(struct vcpu *v); +long vcpu_yield(void); void vcpu_sleep_nosync(struct vcpu *v); void vcpu_sleep_sync(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 Jul 31 17:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:44: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 1XCuOd-0008DB-Bf; Thu, 31 Jul 2014 17:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOc-0008Cy-7p for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:06 +0000 Received: from [193.109.254.147:5812] by server-4.bemta-14.messagelabs.com id 81/97-23592-5608AD35; Thu, 31 Jul 2014 17:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1406828644!13021256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27278 invoked from network); 31 Jul 2014 17:44:05 -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; 31 Jul 2014 17:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOZ-0000O8-MX for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOZ-0002Oh-Ag for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:03 +0000 Date: Thu, 31 Jul 2014 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: export do_yield as vcpu_yield X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afac868e50ace7e89fcf87d4f079d2185ea4b738 Author: Stefano Stabellini AuthorDate: Wed Jul 23 14:37:22 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:15 2014 +0100 xen: export do_yield as vcpu_yield Signed-off-by: Stefano Stabellini Acked-by: George Dunlap CC: JBeulich@suse.com --- xen/common/schedule.c | 6 +++--- xen/include/xen/sched.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index e9eb0bc..9a49769 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -795,7 +795,7 @@ static long do_poll(struct sched_poll *sched_poll) } /* Voluntarily yield the processor for this allocation. */ -static long do_yield(void) +long vcpu_yield(void) { struct vcpu * v=current; spinlock_t *lock = vcpu_schedule_lock_irq(v); @@ -888,7 +888,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } @@ -925,7 +925,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 67eb8f0..4575dda 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -639,6 +639,7 @@ int sched_id(void); void sched_tick_suspend(void); void sched_tick_resume(void); void vcpu_wake(struct vcpu *v); +long vcpu_yield(void); void vcpu_sleep_nosync(struct vcpu *v); void vcpu_sleep_sync(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 Jul 31 17:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 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 1XCuOo-0008F5-EC; Thu, 31 Jul 2014 17: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 1XCuOn-0008Ep-5f for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:17 +0000 Received: from [85.158.137.68:10449] by server-7.bemta-3.messagelabs.com id 63/D2-01084-0708AD35; Thu, 31 Jul 2014 17:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1406828654!11154170!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17080 invoked from network); 31 Jul 2014 17: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; 31 Jul 2014 17:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOk-0000OB-8X for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOj-0002P7-Qs for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:13 +0000 Date: Thu, 31 Jul 2014 17:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: call vcpu_yield on WFE trap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77038d0f76bccb0c75de92b2f24269300df15a44 Author: Stefano Stabellini AuthorDate: Wed Jul 23 14:37:23 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 xen/arm: call vcpu_yield on WFE trap No need to call vcpu_force_reschedule, is too expensive. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- 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 3dfabd0..76a9586 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1805,7 +1805,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) } if ( hsr.wfi_wfe.ti ) { /* Yield the VCPU for WFE */ - vcpu_force_reschedule(current); + vcpu_yield(); } else { /* Block the VCPU for WFI */ vcpu_block_unless_event_pending(current); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 31 17:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 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 1XCuOo-0008F5-EC; Thu, 31 Jul 2014 17: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 1XCuOn-0008Ep-5f for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:17 +0000 Received: from [85.158.137.68:10449] by server-7.bemta-3.messagelabs.com id 63/D2-01084-0708AD35; Thu, 31 Jul 2014 17:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1406828654!11154170!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17080 invoked from network); 31 Jul 2014 17: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; 31 Jul 2014 17:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOk-0000OB-8X for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOj-0002P7-Qs for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:13 +0000 Date: Thu, 31 Jul 2014 17:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: call vcpu_yield on WFE trap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77038d0f76bccb0c75de92b2f24269300df15a44 Author: Stefano Stabellini AuthorDate: Wed Jul 23 14:37:23 2014 +0100 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 xen/arm: call vcpu_yield on WFE trap No need to call vcpu_force_reschedule, is too expensive. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- 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 3dfabd0..76a9586 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1805,7 +1805,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) } if ( hsr.wfi_wfe.ti ) { /* Yield the VCPU for WFE */ - vcpu_force_reschedule(current); + vcpu_yield(); } else { /* Block the VCPU for WFI */ vcpu_block_unless_event_pending(current); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 31 17:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuOy-0008HC-H6; Thu, 31 Jul 2014 17:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOx-0008Gu-3V for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:27 +0000 Received: from [193.109.254.147:10241] by server-10.bemta-14.messagelabs.com id CC/B3-06615-A708AD35; Thu, 31 Jul 2014 17:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828664!13014988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20275 invoked from network); 31 Jul 2014 17:44:25 -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; 31 Jul 2014 17:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOu-0000OK-L9 for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOu-0002QD-DS for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:24 +0000 Date: Thu, 31 Jul 2014 17:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: also fail if only 1 socket was given by systemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdc74c9aa5b0c9d540414c10e216aa585bce6851 Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:15 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 cxenstored: also fail if only 1 socket was given by systemd Reported-by: Ian Campbell Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 7f72f68..4eaff57 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1770,7 +1770,7 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) strerror(errno), errno); barf_perror("sd_listen_fds() failed\n"); - } else if (n > 2) { + } else if (n != 2) { fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" "ERRNO=%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 Thu Jul 31 17:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuOy-0008HC-H6; Thu, 31 Jul 2014 17:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOx-0008Gu-3V for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:27 +0000 Received: from [193.109.254.147:10241] by server-10.bemta-14.messagelabs.com id CC/B3-06615-A708AD35; Thu, 31 Jul 2014 17:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828664!13014988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20275 invoked from network); 31 Jul 2014 17:44:25 -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; 31 Jul 2014 17:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuOu-0000OK-L9 for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuOu-0002QD-DS for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:24 +0000 Date: Thu, 31 Jul 2014 17:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: also fail if only 1 socket was given by systemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdc74c9aa5b0c9d540414c10e216aa585bce6851 Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:15 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 cxenstored: also fail if only 1 socket was given by systemd Reported-by: Ian Campbell Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 7f72f68..4eaff57 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1770,7 +1770,7 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) strerror(errno), errno); barf_perror("sd_listen_fds() failed\n"); - } else if (n > 2) { + } else if (n != 2) { fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" "ERRNO=%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 Thu Jul 31 17:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuP8-0008J7-Jp; Thu, 31 Jul 2014 17: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 1XCuP7-0008Ip-Hp for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:37 +0000 Received: from [193.109.254.147:40687] by server-14.bemta-14.messagelabs.com id EE/33-02763-4808AD35; Thu, 31 Jul 2014 17:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406828675!12982910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25796 invoked from network); 31 Jul 2014 17:44:36 -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; 31 Jul 2014 17:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuP4-0000OS-Ub for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuP4-0002Qg-PD for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:34 +0000 Date: Thu, 31 Jul 2014 17:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: also fail if only 1 socket was given by systemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1846031d472f85b44d873bce76c6ceca9649efbd Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:16 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 oxenstored: also fail if only 1 socket was given by systemd Reported-by: Ian Campbell Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/ocaml/xenstored/systemd_stubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index a368ac1..623592c 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -72,7 +72,7 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) strerror(errno), errno); caml_failwith("ocaml_sd_listen_fds() failed to get any sockets"); - } else if (n > 2) { + } else if (n != 2) { fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" "ERRNO=%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 Thu Jul 31 17:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuP8-0008J7-Jp; Thu, 31 Jul 2014 17: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 1XCuP7-0008Ip-Hp for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:37 +0000 Received: from [193.109.254.147:40687] by server-14.bemta-14.messagelabs.com id EE/33-02763-4808AD35; Thu, 31 Jul 2014 17:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406828675!12982910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25796 invoked from network); 31 Jul 2014 17:44:36 -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; 31 Jul 2014 17:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuP4-0000OS-Ub for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuP4-0002Qg-PD for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:34 +0000 Date: Thu, 31 Jul 2014 17:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: also fail if only 1 socket was given by systemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1846031d472f85b44d873bce76c6ceca9649efbd Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:16 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 oxenstored: also fail if only 1 socket was given by systemd Reported-by: Ian Campbell Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- tools/ocaml/xenstored/systemd_stubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index a368ac1..623592c 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -72,7 +72,7 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) strerror(errno), errno); caml_failwith("ocaml_sd_listen_fds() failed to get any sockets"); - } else if (n > 2) { + } else if (n != 2) { fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n); sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n" "ERRNO=%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 Thu Jul 31 17:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:44: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 1XCuPJ-0008LR-Mb; Thu, 31 Jul 2014 17:44:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPI-0008L4-8A for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:48 +0000 Received: from [193.109.254.147:41334] by server-11.bemta-14.messagelabs.com id 82/6B-14213-F808AD35; Thu, 31 Jul 2014 17:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828685!13015021!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21340 invoked from network); 31 Jul 2014 17:44:46 -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; 31 Jul 2014 17:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPF-0000OY-7v for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPF-0002R2-1x for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:45 +0000 Date: Thu, 31 Jul 2014 17:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: move standard path variables to config/Paths.mk.in X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54f28913a2b391f15b81e505ebc36c2b42359a6d Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:17 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 autoconf: xen: move standard path variables to config/Paths.mk.in This moves all generic path variables to a new the config/Paths.mk.in input source file to be processed at configure time, tons of files use these so this just share them. This also paves the way to let us easily dynamically configure these with autoconf, for now we leave the same presets as was present before. This work was prompted by looking for an autoconf way to do replacements for the hotplug global file, while at it I realized that a few other files use the same variables and have in places around the tree the same constructs for generating their own files. This makes use of the old buildmakevars2file() but generalizes the definition of the paths at configure time and spreads the new definitions out throughout the build system. This has no impact on building the hypervisor and extras/mini-os, you do not need to, and are not expected to, run configure to build those targets. While at it lets add some documentation on the for the two files on the source file, we can expand further details on the wiki [0]. [0] http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration Cc: Ian Campbell Cc: Ian Jackson Cc: Samuel Thibault Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- .gitignore | 1 + config/Paths.mk.in | 37 ++++++++++++++++++++++ config/Stubdom.mk.in | 1 + configure | 83 ++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 8 ++++- m4/paths.m4 | 61 ++++++++++++++++++++++++++++++++++++ tools/Rules.mk | 1 + 7 files changed, 189 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fefe13c..f1d1b9c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ config.log config.status config.cache config/Toplevel.mk +config/Paths.mk build-* dist/* diff --git a/config/Paths.mk.in b/config/Paths.mk.in new file mode 100644 index 0000000..507b6d1 --- /dev/null +++ b/config/Paths.mk.in @@ -0,0 +1,37 @@ +# Xen system configuration +# ======================== +# +# Xen uses a set of variables for system configuration and at build time, +# because of this these variables are defined on one master input source file +# and is generated after running ./configure. The master source is located +# on the xen source tree at under config/Paths.mk.in and it is used to +# generate shell or header files by the build system upon demand through the +# use of the helper makefile helper buildmakevars2file(). +# +# For more documentation you can refer to the wiki: +# +# http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration + +SBINDIR := @SBINDIR@ +BINDIR := @BINDIR@ +LIBEXEC := @LIBEXEC@ + +SHAREDIR := @SHAREDIR@ +LIBDIR := @LIBDIR@ + +XEN_RUN_DIR := @XEN_RUN_DIR@ +XEN_LOG_DIR := @XEN_LOG_DIR@ +XEN_LIB_STORED := @XEN_LIB_STORED@ + +CONFIG_DIR := @CONFIG_DIR@ +XEN_LOCK_DIR := @XEN_LOCK_DIR@ +XEN_PAGING_DIR := @XEN_PAGING_DIR@ + +PRIVATE_PREFIX := @PRIVATE_PREFIX@ +PRIVATE_PREFIX := @PKG_XEN_PREFIX@ +PRIVATE_BINDIR := @PRIVATE_BINDIR@ + +XENFIRMWAREDIR := @XENFIRMWAREDIR@ + +XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ +XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 302842e..6bce206 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,4 +1,5 @@ # Prefix and install folder +include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/configure b/configure index d5c8500..1ff0a44 100755 --- a/configure +++ b/configure @@ -594,6 +594,23 @@ stubdom tools xen subdirs +XEN_PAGING_DIR +XEN_LOCK_DIR +XEN_SCRIPT_DIR +XEN_CONFIG_DIR +CONFIG_DIR +XENFIRMWAREDIR +PRIVATE_BINDIR +PKG_XEN_PREFIX +PRIVATE_PREFIX +SHAREDIR +XEN_LIB_STORED +XEN_LOG_DIR +XEN_RUN_DIR +LIBDIR +LIBEXEC +SBINDIR +BINDIR host_os host_vendor host_cpu @@ -1702,7 +1719,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ./config/Toplevel.mk" +ac_config_files="$ac_config_files config/Toplevel.mk config/Paths.mk" ac_aux_dir= @@ -1829,6 +1846,67 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin + + +SBINDIR=$prefix/sbin + + +LIBEXEC=$prefix/lib/xen/bin + + +LIBDIR=`eval echo $libdir` + + +XEN_RUN_DIR=/var/run/xen + + +XEN_LOG_DIR=/var/log/xen + + +XEN_LIB_STORED=/var/lib/xenstored + + +SHAREDIR=$prefix/share + + +PRIVATE_PREFIX=$LIBDIR/xen + + +PKG_XEN_PREFIX=$LIBDIR/xen + + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin + + +XENFIRMWAREDIR=$prefix/lib/xen/boot + + +CONFIG_DIR=/etc + + +XEN_CONFIG_DIR=$CONFIG_DIR/xen + + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + + +XEN_LOCK_DIR=/var/lock + + +XEN_RUN_DIR=/var/run/xen + + +XEN_PAGING_DIR=/var/lib/xen/xenpaging + + + case "$host_cpu" in i[3456]86|x86_64) arch_enable_stubdom=y @@ -2749,7 +2827,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "./config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES ./config/Toplevel.mk" ;; + "config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES config/Toplevel.mk" ;; + "config/Paths.mk") CONFIG_FILES="$CONFIG_FILES config/Paths.mk" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 6c14524..f32f9af 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,18 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor], m4_esyscmd([./version.sh ./xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([./xen/common/kernel.c]) -AC_CONFIG_FILES([./config/Toplevel.mk]) +AC_CONFIG_FILES([ + config/Toplevel.mk + config/Paths.mk +]) AC_CANONICAL_HOST m4_include([m4/features.m4]) m4_include([m4/subsystem.m4]) +m4_include([m4/paths.m4]) + +AX_XEN_EXPAND_CONFIG() dnl mini-os is only ported to certain platforms case "$host_cpu" in diff --git a/m4/paths.m4 b/m4/paths.m4 new file mode 100644 index 0000000..717fcd1 --- /dev/null +++ b/m4/paths.m4 @@ -0,0 +1,61 @@ +AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ +dnl expand these early so we can use this for substitutions +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin +AC_SUBST(BINDIR) + +SBINDIR=$prefix/sbin +AC_SUBST(SBINDIR) + +dnl XXX: this should be changed to use the passed $libexec +dnl but can be done as a second step +LIBEXEC=$prefix/lib/xen/bin +AC_SUBST(LIBEXEC) + +LIBDIR=`eval echo $libdir` +AC_SUBST(LIBDIR) + +XEN_RUN_DIR=/var/run/xen +AC_SUBST(XEN_RUN_DIR) + +XEN_LOG_DIR=/var/log/xen +AC_SUBST(XEN_LOG_DIR) + +XEN_LIB_STORED=/var/lib/xenstored +AC_SUBST(XEN_LIB_STORED) + +SHAREDIR=$prefix/share +AC_SUBST(SHAREDIR) + +PRIVATE_PREFIX=$LIBDIR/xen +AC_SUBST(PRIVATE_PREFIX) + +PKG_XEN_PREFIX=$LIBDIR/xen +AC_SUBST(PKG_XEN_PREFIX) + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin +AC_SUBST(PRIVATE_BINDIR) + +XENFIRMWAREDIR=$prefix/lib/xen/boot +AC_SUBST(XENFIRMWAREDIR) + +CONFIG_DIR=/etc +AC_SUBST(CONFIG_DIR) + +XEN_CONFIG_DIR=$CONFIG_DIR/xen +AC_SUBST(XEN_CONFIG_DIR) + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts +AC_SUBST(XEN_SCRIPT_DIR) + +XEN_LOCK_DIR=/var/lock +AC_SUBST(XEN_LOCK_DIR) + +XEN_RUN_DIR=/var/run/xen +AC_SUBST(XEN_RUN_DIR) + +XEN_PAGING_DIR=/var/lib/xen/xenpaging +AC_SUBST(XEN_PAGING_DIR) +]) diff --git a/tools/Rules.mk b/tools/Rules.mk index 9ac8541..0aa1e6b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,6 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk +include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install -- generated by git-patchbot for /home/xen/git/xen.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 Jul 31 17:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:44: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 1XCuPJ-0008LR-Mb; Thu, 31 Jul 2014 17:44:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPI-0008L4-8A for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:48 +0000 Received: from [193.109.254.147:41334] by server-11.bemta-14.messagelabs.com id 82/6B-14213-F808AD35; Thu, 31 Jul 2014 17:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828685!13015021!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21340 invoked from network); 31 Jul 2014 17:44:46 -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; 31 Jul 2014 17:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPF-0000OY-7v for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPF-0002R2-1x for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:45 +0000 Date: Thu, 31 Jul 2014 17:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: move standard path variables to config/Paths.mk.in X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54f28913a2b391f15b81e505ebc36c2b42359a6d Author: Luis R. Rodriguez AuthorDate: Fri Jul 25 19:14:17 2014 -0700 Commit: Ian Campbell CommitDate: Mon Jul 28 13:44:18 2014 +0100 autoconf: xen: move standard path variables to config/Paths.mk.in This moves all generic path variables to a new the config/Paths.mk.in input source file to be processed at configure time, tons of files use these so this just share them. This also paves the way to let us easily dynamically configure these with autoconf, for now we leave the same presets as was present before. This work was prompted by looking for an autoconf way to do replacements for the hotplug global file, while at it I realized that a few other files use the same variables and have in places around the tree the same constructs for generating their own files. This makes use of the old buildmakevars2file() but generalizes the definition of the paths at configure time and spreads the new definitions out throughout the build system. This has no impact on building the hypervisor and extras/mini-os, you do not need to, and are not expected to, run configure to build those targets. While at it lets add some documentation on the for the two files on the source file, we can expand further details on the wiki [0]. [0] http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration Cc: Ian Campbell Cc: Ian Jackson Cc: Samuel Thibault Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- reran autogen.sh ] --- .gitignore | 1 + config/Paths.mk.in | 37 ++++++++++++++++++++++ config/Stubdom.mk.in | 1 + configure | 83 ++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 8 ++++- m4/paths.m4 | 61 ++++++++++++++++++++++++++++++++++++ tools/Rules.mk | 1 + 7 files changed, 189 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fefe13c..f1d1b9c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ config.log config.status config.cache config/Toplevel.mk +config/Paths.mk build-* dist/* diff --git a/config/Paths.mk.in b/config/Paths.mk.in new file mode 100644 index 0000000..507b6d1 --- /dev/null +++ b/config/Paths.mk.in @@ -0,0 +1,37 @@ +# Xen system configuration +# ======================== +# +# Xen uses a set of variables for system configuration and at build time, +# because of this these variables are defined on one master input source file +# and is generated after running ./configure. The master source is located +# on the xen source tree at under config/Paths.mk.in and it is used to +# generate shell or header files by the build system upon demand through the +# use of the helper makefile helper buildmakevars2file(). +# +# For more documentation you can refer to the wiki: +# +# http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration + +SBINDIR := @SBINDIR@ +BINDIR := @BINDIR@ +LIBEXEC := @LIBEXEC@ + +SHAREDIR := @SHAREDIR@ +LIBDIR := @LIBDIR@ + +XEN_RUN_DIR := @XEN_RUN_DIR@ +XEN_LOG_DIR := @XEN_LOG_DIR@ +XEN_LIB_STORED := @XEN_LIB_STORED@ + +CONFIG_DIR := @CONFIG_DIR@ +XEN_LOCK_DIR := @XEN_LOCK_DIR@ +XEN_PAGING_DIR := @XEN_PAGING_DIR@ + +PRIVATE_PREFIX := @PRIVATE_PREFIX@ +PRIVATE_PREFIX := @PKG_XEN_PREFIX@ +PRIVATE_BINDIR := @PRIVATE_BINDIR@ + +XENFIRMWAREDIR := @XENFIRMWAREDIR@ + +XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ +XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 302842e..6bce206 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,4 +1,5 @@ # Prefix and install folder +include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/configure b/configure index d5c8500..1ff0a44 100755 --- a/configure +++ b/configure @@ -594,6 +594,23 @@ stubdom tools xen subdirs +XEN_PAGING_DIR +XEN_LOCK_DIR +XEN_SCRIPT_DIR +XEN_CONFIG_DIR +CONFIG_DIR +XENFIRMWAREDIR +PRIVATE_BINDIR +PKG_XEN_PREFIX +PRIVATE_PREFIX +SHAREDIR +XEN_LIB_STORED +XEN_LOG_DIR +XEN_RUN_DIR +LIBDIR +LIBEXEC +SBINDIR +BINDIR host_os host_vendor host_cpu @@ -1702,7 +1719,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ./config/Toplevel.mk" +ac_config_files="$ac_config_files config/Toplevel.mk config/Paths.mk" ac_aux_dir= @@ -1829,6 +1846,67 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin + + +SBINDIR=$prefix/sbin + + +LIBEXEC=$prefix/lib/xen/bin + + +LIBDIR=`eval echo $libdir` + + +XEN_RUN_DIR=/var/run/xen + + +XEN_LOG_DIR=/var/log/xen + + +XEN_LIB_STORED=/var/lib/xenstored + + +SHAREDIR=$prefix/share + + +PRIVATE_PREFIX=$LIBDIR/xen + + +PKG_XEN_PREFIX=$LIBDIR/xen + + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin + + +XENFIRMWAREDIR=$prefix/lib/xen/boot + + +CONFIG_DIR=/etc + + +XEN_CONFIG_DIR=$CONFIG_DIR/xen + + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + + +XEN_LOCK_DIR=/var/lock + + +XEN_RUN_DIR=/var/run/xen + + +XEN_PAGING_DIR=/var/lib/xen/xenpaging + + + case "$host_cpu" in i[3456]86|x86_64) arch_enable_stubdom=y @@ -2749,7 +2827,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "./config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES ./config/Toplevel.mk" ;; + "config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES config/Toplevel.mk" ;; + "config/Paths.mk") CONFIG_FILES="$CONFIG_FILES config/Paths.mk" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 6c14524..f32f9af 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,18 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor], m4_esyscmd([./version.sh ./xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([./xen/common/kernel.c]) -AC_CONFIG_FILES([./config/Toplevel.mk]) +AC_CONFIG_FILES([ + config/Toplevel.mk + config/Paths.mk +]) AC_CANONICAL_HOST m4_include([m4/features.m4]) m4_include([m4/subsystem.m4]) +m4_include([m4/paths.m4]) + +AX_XEN_EXPAND_CONFIG() dnl mini-os is only ported to certain platforms case "$host_cpu" in diff --git a/m4/paths.m4 b/m4/paths.m4 new file mode 100644 index 0000000..717fcd1 --- /dev/null +++ b/m4/paths.m4 @@ -0,0 +1,61 @@ +AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ +dnl expand these early so we can use this for substitutions +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin +AC_SUBST(BINDIR) + +SBINDIR=$prefix/sbin +AC_SUBST(SBINDIR) + +dnl XXX: this should be changed to use the passed $libexec +dnl but can be done as a second step +LIBEXEC=$prefix/lib/xen/bin +AC_SUBST(LIBEXEC) + +LIBDIR=`eval echo $libdir` +AC_SUBST(LIBDIR) + +XEN_RUN_DIR=/var/run/xen +AC_SUBST(XEN_RUN_DIR) + +XEN_LOG_DIR=/var/log/xen +AC_SUBST(XEN_LOG_DIR) + +XEN_LIB_STORED=/var/lib/xenstored +AC_SUBST(XEN_LIB_STORED) + +SHAREDIR=$prefix/share +AC_SUBST(SHAREDIR) + +PRIVATE_PREFIX=$LIBDIR/xen +AC_SUBST(PRIVATE_PREFIX) + +PKG_XEN_PREFIX=$LIBDIR/xen +AC_SUBST(PKG_XEN_PREFIX) + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin +AC_SUBST(PRIVATE_BINDIR) + +XENFIRMWAREDIR=$prefix/lib/xen/boot +AC_SUBST(XENFIRMWAREDIR) + +CONFIG_DIR=/etc +AC_SUBST(CONFIG_DIR) + +XEN_CONFIG_DIR=$CONFIG_DIR/xen +AC_SUBST(XEN_CONFIG_DIR) + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts +AC_SUBST(XEN_SCRIPT_DIR) + +XEN_LOCK_DIR=/var/lock +AC_SUBST(XEN_LOCK_DIR) + +XEN_RUN_DIR=/var/run/xen +AC_SUBST(XEN_RUN_DIR) + +XEN_PAGING_DIR=/var/lib/xen/xenpaging +AC_SUBST(XEN_PAGING_DIR) +]) diff --git a/tools/Rules.mk b/tools/Rules.mk index 9ac8541..0aa1e6b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,6 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk +include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install -- generated by git-patchbot for /home/xen/git/xen.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 Jul 31 17:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuPS-0008N0-PC; Thu, 31 Jul 2014 17:44:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPR-0008Mk-TE for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:57 +0000 Received: from [193.109.254.147:12663] by server-16.bemta-14.messagelabs.com id 28/30-14741-9908AD35; Thu, 31 Jul 2014 17:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406828695!12982958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27021 invoked from network); 31 Jul 2014 17:44:56 -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; 31 Jul 2014 17:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPP-0000Oh-Du for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPP-0002RQ-Bu for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:55 +0000 Date: Thu, 31 Jul 2014 17:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] annotate debugtrace_printk() with a printf compiler __attribute__ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1833bfb491b69f0373eb069a559aedb385c67ca Author: Andrew Cooper AuthorDate: Mon Jul 28 16:53:35 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 16:53:35 2014 +0200 annotate debugtrace_printk() with a printf compiler __attribute__ And fix up the resulting compilation issue. Signed-off-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 2 +- xen/include/xen/lib.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 2c7bc0f..bca9f0f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1807,7 +1807,7 @@ void audit_p2m(struct domain *d, P2M_PRINTK("p2m audit complete\n"); if ( orphans_count | mpbad | pmbad ) - P2M_PRINTK("p2m audit found %lu orphans\n", orphans); + P2M_PRINTK("p2m audit found %lu orphans\n", orphans_count); if ( mpbad | pmbad ) { P2M_PRINTK("p2m audit found %lu odd p2m, %lu bad m2p entries\n", diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e81b80e..f11b49e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -75,7 +75,8 @@ int parse_bool(const char *s); /*#define DEBUG_TRACE_DUMP*/ #ifdef DEBUG_TRACE_DUMP extern void debugtrace_dump(void); -extern void debugtrace_printk(const char *fmt, ...); +extern void debugtrace_printk(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); #else #define debugtrace_dump() ((void)0) #define debugtrace_printk(_f, ...) ((void)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 Jul 31 17:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17: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 1XCuPS-0008N0-PC; Thu, 31 Jul 2014 17:44:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPR-0008Mk-TE for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:57 +0000 Received: from [193.109.254.147:12663] by server-16.bemta-14.messagelabs.com id 28/30-14741-9908AD35; Thu, 31 Jul 2014 17:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406828695!12982958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27021 invoked from network); 31 Jul 2014 17:44:56 -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; 31 Jul 2014 17:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPP-0000Oh-Du for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPP-0002RQ-Bu for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:44:55 +0000 Date: Thu, 31 Jul 2014 17:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] annotate debugtrace_printk() with a printf compiler __attribute__ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1833bfb491b69f0373eb069a559aedb385c67ca Author: Andrew Cooper AuthorDate: Mon Jul 28 16:53:35 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 16:53:35 2014 +0200 annotate debugtrace_printk() with a printf compiler __attribute__ And fix up the resulting compilation issue. Signed-off-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 2 +- xen/include/xen/lib.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 2c7bc0f..bca9f0f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1807,7 +1807,7 @@ void audit_p2m(struct domain *d, P2M_PRINTK("p2m audit complete\n"); if ( orphans_count | mpbad | pmbad ) - P2M_PRINTK("p2m audit found %lu orphans\n", orphans); + P2M_PRINTK("p2m audit found %lu orphans\n", orphans_count); if ( mpbad | pmbad ) { P2M_PRINTK("p2m audit found %lu odd p2m, %lu bad m2p entries\n", diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e81b80e..f11b49e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -75,7 +75,8 @@ int parse_bool(const char *s); /*#define DEBUG_TRACE_DUMP*/ #ifdef DEBUG_TRACE_DUMP extern void debugtrace_dump(void); -extern void debugtrace_printk(const char *fmt, ...); +extern void debugtrace_printk(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); #else #define debugtrace_dump() ((void)0) #define debugtrace_printk(_f, ...) ((void)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 Jul 31 17:45:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuPt-0008Pr-05; Thu, 31 Jul 2014 17:45:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPr-0008Pg-Ga for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:23 +0000 Received: from [85.158.143.35:61229] by server-2.bemta-4.messagelabs.com id 74/BC-04525-2B08AD35; Thu, 31 Jul 2014 17:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1406828721!12707983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31915 invoked from network); 31 Jul 2014 17:45:22 -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; 31 Jul 2014 17:45:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPo-0000Pi-TL for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPe-0002S7-RP for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:10 +0000 Date: Thu, 31 Jul 2014 17:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: alter hpet_init() to take a domain rather than vcpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76f657aea9f168ca617f98d513540bb3587c974b Author: Andrew Cooper AuthorDate: Mon Jul 28 16:55:32 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 16:55:32 2014 +0200 x86/hvm: alter hpet_init() to take a domain rather than vcpu There is nothing vcpu-specific about hpet_init(); all it does is follow the vcpu's domain pointer to get at the domain vhpet state. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hpet.c | 6 +++--- xen/arch/x86/hvm/hvm.c | 2 +- xen/include/asm-x86/hvm/vpt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 167994e..81ad0d6 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -611,9 +611,9 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1, HVMSR_PER_DOM); -void hpet_init(struct vcpu *v) +void hpet_init(struct domain *d) { - HPETState *h = vcpu_vhpet(v); + HPETState *h = domain_vhpet(d); int i; memset(h, 0, sizeof(HPETState)); @@ -665,7 +665,7 @@ void hpet_deinit(struct domain *d) void hpet_reset(struct domain *d) { hpet_deinit(d); - hpet_init(d->vcpu[0]); + hpet_init(d); } /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fba13e0..e834406 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2300,7 +2300,7 @@ int hvm_vcpu_initialise(struct vcpu *v) { /* NB. All these really belong in hvm_domain_initialise(). */ pmtimer_init(v); - hpet_init(v); + hpet_init(d); /* Init guest TSC to start from zero. */ hvm_set_guest_tsc(v, 0); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 41159d8..105fbdb 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -190,7 +190,7 @@ void pmtimer_deinit(struct domain *d); void pmtimer_reset(struct domain *d); int pmtimer_change_ioport(struct domain *d, unsigned int version); -void hpet_init(struct vcpu *v); +void hpet_init(struct domain *d); void hpet_deinit(struct domain *d); void hpet_reset(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 Thu Jul 31 17:45:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuPt-0008Pr-05; Thu, 31 Jul 2014 17:45:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPr-0008Pg-Ga for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:23 +0000 Received: from [85.158.143.35:61229] by server-2.bemta-4.messagelabs.com id 74/BC-04525-2B08AD35; Thu, 31 Jul 2014 17:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1406828721!12707983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31915 invoked from network); 31 Jul 2014 17:45:22 -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; 31 Jul 2014 17:45:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPo-0000Pi-TL for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPe-0002S7-RP for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:10 +0000 Date: Thu, 31 Jul 2014 17:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: alter hpet_init() to take a domain rather than vcpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76f657aea9f168ca617f98d513540bb3587c974b Author: Andrew Cooper AuthorDate: Mon Jul 28 16:55:32 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 16:55:32 2014 +0200 x86/hvm: alter hpet_init() to take a domain rather than vcpu There is nothing vcpu-specific about hpet_init(); all it does is follow the vcpu's domain pointer to get at the domain vhpet state. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hpet.c | 6 +++--- xen/arch/x86/hvm/hvm.c | 2 +- xen/include/asm-x86/hvm/vpt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 167994e..81ad0d6 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -611,9 +611,9 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1, HVMSR_PER_DOM); -void hpet_init(struct vcpu *v) +void hpet_init(struct domain *d) { - HPETState *h = vcpu_vhpet(v); + HPETState *h = domain_vhpet(d); int i; memset(h, 0, sizeof(HPETState)); @@ -665,7 +665,7 @@ void hpet_deinit(struct domain *d) void hpet_reset(struct domain *d) { hpet_deinit(d); - hpet_init(d->vcpu[0]); + hpet_init(d); } /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fba13e0..e834406 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2300,7 +2300,7 @@ int hvm_vcpu_initialise(struct vcpu *v) { /* NB. All these really belong in hvm_domain_initialise(). */ pmtimer_init(v); - hpet_init(v); + hpet_init(d); /* Init guest TSC to start from zero. */ hvm_set_guest_tsc(v, 0); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 41159d8..105fbdb 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -190,7 +190,7 @@ void pmtimer_deinit(struct domain *d); void pmtimer_reset(struct domain *d); int pmtimer_change_ioport(struct domain *d, unsigned int version); -void hpet_init(struct vcpu *v); +void hpet_init(struct domain *d); void hpet_deinit(struct domain *d); void hpet_reset(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 Thu Jul 31 17:45:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQ3-0008RW-4h; Thu, 31 Jul 2014 17:45:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQ1-0008RI-TH for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:34 +0000 Received: from [193.109.254.147:14704] by server-8.bemta-14.messagelabs.com id 58/B0-07074-DB08AD35; Thu, 31 Jul 2014 17:45:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828731!13015100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24910 invoked from network); 31 Jul 2014 17:45:32 -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; 31 Jul 2014 17:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPz-0000Pq-2Z for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPz-0002TR-0p for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:31 +0000 Date: Thu, 31 Jul 2014 17:45:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use libxl_fd_set_{cloexec, nonblock} helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 216236c58740cc7683fe4338ebb1915236d39a43 Author: Jan Beulich AuthorDate: Tue Jul 29 16:51:26 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 16:51:26 2014 +0200 libxl: use libxl_fd_set_{cloexec,nonblock} helpers ... instead of open-coding them or not using them at all. This in particular fixes a build (and presumably also runtime) problem on old enough libc due to the recent introduction of a use of O_CLOEXEC. The other two changes are only of cleanup kind. Signed-off-by: Jan Beulich Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 14 ++------------ tools/libxl/libxl_qmp.c | 9 ++------- tools/libxl/libxl_utils.c | 7 ++++++- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0686f96..5bc8286 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -977,7 +977,7 @@ void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; struct timeval start_time; - int i, esave, flags; + int i, esave; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; @@ -1045,17 +1045,7 @@ out: } esave = errno; - - flags = fcntl(fd, F_GETFL); - if (flags == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); - } else { - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) == -1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" - " back to blocking mode"); - } - + libxl_fd_set_nonblock(ctx, fd, 0); errno = esave; domcreate_rebuild_done(egc, dcs, ret); } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 5cc56b1..c7324e6 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -358,19 +358,14 @@ static int qmp_open(libxl__qmp_handler *qmp, const char *qmp_socket_path, int timeout) { int ret; - int flags = 0; int i = 0; qmp->qmp_fd = socket(AF_UNIX, SOCK_STREAM, 0); if (qmp->qmp_fd < 0) { return -1; } - if ((flags = fcntl(qmp->qmp_fd, F_GETFL)) == -1) { - flags = 0; - } - if (fcntl(qmp->qmp_fd, F_SETFL, flags | O_NONBLOCK) == -1) { - return -1; - } + ret = libxl_fd_set_nonblock(qmp->ctx, qmp->qmp_fd, 1); + if (ret) return -1; ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); if (ret) return -1; diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 1fdf5ea..58df4f3 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -1047,11 +1047,16 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len) int fd; int ret; - fd = open(dev, O_RDONLY | O_CLOEXEC); + fd = open(dev, O_RDONLY); if (fd < 0) { LOGE(ERROR, "failed to open \"%s\"", dev); return ERROR_FAIL; } + ret = libxl_fd_set_cloexec(CTX, fd, 1); + if (ret) { + close(fd); + return ERROR_FAIL; + } ret = libxl_read_exactly(CTX, fd, buf, len, dev, 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 Jul 31 17:45:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQ3-0008RW-4h; Thu, 31 Jul 2014 17:45:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQ1-0008RI-TH for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:34 +0000 Received: from [193.109.254.147:14704] by server-8.bemta-14.messagelabs.com id 58/B0-07074-DB08AD35; Thu, 31 Jul 2014 17:45:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1406828731!13015100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24910 invoked from network); 31 Jul 2014 17:45:32 -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; 31 Jul 2014 17:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuPz-0000Pq-2Z for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuPz-0002TR-0p for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:31 +0000 Date: Thu, 31 Jul 2014 17:45:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use libxl_fd_set_{cloexec, nonblock} helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 216236c58740cc7683fe4338ebb1915236d39a43 Author: Jan Beulich AuthorDate: Tue Jul 29 16:51:26 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 16:51:26 2014 +0200 libxl: use libxl_fd_set_{cloexec,nonblock} helpers ... instead of open-coding them or not using them at all. This in particular fixes a build (and presumably also runtime) problem on old enough libc due to the recent introduction of a use of O_CLOEXEC. The other two changes are only of cleanup kind. Signed-off-by: Jan Beulich Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 14 ++------------ tools/libxl/libxl_qmp.c | 9 ++------- tools/libxl/libxl_utils.c | 7 ++++++- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0686f96..5bc8286 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -977,7 +977,7 @@ void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; struct timeval start_time; - int i, esave, flags; + int i, esave; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; @@ -1045,17 +1045,7 @@ out: } esave = errno; - - flags = fcntl(fd, F_GETFL); - if (flags == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); - } else { - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) == -1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" - " back to blocking mode"); - } - + libxl_fd_set_nonblock(ctx, fd, 0); errno = esave; domcreate_rebuild_done(egc, dcs, ret); } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 5cc56b1..c7324e6 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -358,19 +358,14 @@ static int qmp_open(libxl__qmp_handler *qmp, const char *qmp_socket_path, int timeout) { int ret; - int flags = 0; int i = 0; qmp->qmp_fd = socket(AF_UNIX, SOCK_STREAM, 0); if (qmp->qmp_fd < 0) { return -1; } - if ((flags = fcntl(qmp->qmp_fd, F_GETFL)) == -1) { - flags = 0; - } - if (fcntl(qmp->qmp_fd, F_SETFL, flags | O_NONBLOCK) == -1) { - return -1; - } + ret = libxl_fd_set_nonblock(qmp->ctx, qmp->qmp_fd, 1); + if (ret) return -1; ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); if (ret) return -1; diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 1fdf5ea..58df4f3 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -1047,11 +1047,16 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len) int fd; int ret; - fd = open(dev, O_RDONLY | O_CLOEXEC); + fd = open(dev, O_RDONLY); if (fd < 0) { LOGE(ERROR, "failed to open \"%s\"", dev); return ERROR_FAIL; } + ret = libxl_fd_set_cloexec(CTX, fd, 1); + if (ret) { + close(fd); + return ERROR_FAIL; + } ret = libxl_read_exactly(CTX, fd, buf, len, dev, 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 Jul 31 17:45:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQD-0008TF-7L; Thu, 31 Jul 2014 17:45:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQB-0008Sq-Lj for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:43 +0000 Received: from [85.158.143.35:64457] by server-2.bemta-4.messagelabs.com id 3D/EC-04525-7C08AD35; Thu, 31 Jul 2014 17:45:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406828741!12696858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2453 invoked from network); 31 Jul 2014 17:45:42 -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; 31 Jul 2014 17:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQ9-0000Pw-8D for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuQ9-0002Tu-6i for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:41 +0000 Date: Thu, 31 Jul 2014 17:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: remove needless cast X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40cbc40bea2d7c9ab4b9316d4bae1ad858c6ba91 Author: Aravind Gopalakrishnan AuthorDate: Tue Jul 29 16:51:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 16:51:51 2014 +0200 x86, amd_ucode: remove needless cast Missed cleaning up this cast as part of 0aacc28. Doing that here; and we can remove 'off' variable as well, just use *offset in it's place. Signed-off-by: Aravind Gopalakrishnan --- xen/arch/x86/microcode_amd.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 14728a2..8f16826 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -235,27 +235,22 @@ static int get_ucode_from_buffer_amd( size_t bufsize, size_t *offset) { - const uint8_t *bufp = buf; - size_t off; - const struct mpbhdr *mpbuf; - - off = *offset; + const struct mpbhdr *mpbuf = buf + *offset; /* No more data */ - if ( off >= bufsize ) + if ( *offset >= bufsize ) { printk(KERN_ERR "microcode: Microcode buffer overrun\n"); return -EINVAL; } - mpbuf = (const struct mpbhdr *)&bufp[off]; if ( mpbuf->type != UCODE_UCODE_TYPE ) { printk(KERN_ERR "microcode: Wrong microcode payload type field\n"); return -EINVAL; } - if ( (off + mpbuf->len) > bufsize ) + if ( (*offset + mpbuf->len) > bufsize ) { printk(KERN_ERR "microcode: Bad data in microcode data file\n"); return -EINVAL; @@ -275,13 +270,13 @@ static int get_ucode_from_buffer_amd( } memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len); - *offset = off + mpbuf->len + SECTION_HDR_SIZE; - pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n", - raw_smp_processor_id(), bufsize, mpbuf->len, off, + raw_smp_processor_id(), bufsize, mpbuf->len, *offset, ((struct microcode_header_amd *)mc_amd->mpb)->processor_rev_id, ((struct microcode_header_amd *)mc_amd->mpb)->patch_id); + *offset += mpbuf->len + SECTION_HDR_SIZE; + 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 Thu Jul 31 17:45:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQD-0008TF-7L; Thu, 31 Jul 2014 17:45:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQB-0008Sq-Lj for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:43 +0000 Received: from [85.158.143.35:64457] by server-2.bemta-4.messagelabs.com id 3D/EC-04525-7C08AD35; Thu, 31 Jul 2014 17:45:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1406828741!12696858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2453 invoked from network); 31 Jul 2014 17:45:42 -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; 31 Jul 2014 17:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQ9-0000Pw-8D for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuQ9-0002Tu-6i for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:41 +0000 Date: Thu, 31 Jul 2014 17:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: remove needless cast X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40cbc40bea2d7c9ab4b9316d4bae1ad858c6ba91 Author: Aravind Gopalakrishnan AuthorDate: Tue Jul 29 16:51:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 16:51:51 2014 +0200 x86, amd_ucode: remove needless cast Missed cleaning up this cast as part of 0aacc28. Doing that here; and we can remove 'off' variable as well, just use *offset in it's place. Signed-off-by: Aravind Gopalakrishnan --- xen/arch/x86/microcode_amd.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 14728a2..8f16826 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -235,27 +235,22 @@ static int get_ucode_from_buffer_amd( size_t bufsize, size_t *offset) { - const uint8_t *bufp = buf; - size_t off; - const struct mpbhdr *mpbuf; - - off = *offset; + const struct mpbhdr *mpbuf = buf + *offset; /* No more data */ - if ( off >= bufsize ) + if ( *offset >= bufsize ) { printk(KERN_ERR "microcode: Microcode buffer overrun\n"); return -EINVAL; } - mpbuf = (const struct mpbhdr *)&bufp[off]; if ( mpbuf->type != UCODE_UCODE_TYPE ) { printk(KERN_ERR "microcode: Wrong microcode payload type field\n"); return -EINVAL; } - if ( (off + mpbuf->len) > bufsize ) + if ( (*offset + mpbuf->len) > bufsize ) { printk(KERN_ERR "microcode: Bad data in microcode data file\n"); return -EINVAL; @@ -275,13 +270,13 @@ static int get_ucode_from_buffer_amd( } memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len); - *offset = off + mpbuf->len + SECTION_HDR_SIZE; - pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n", - raw_smp_processor_id(), bufsize, mpbuf->len, off, + raw_smp_processor_id(), bufsize, mpbuf->len, *offset, ((struct microcode_header_amd *)mc_amd->mpb)->processor_rev_id, ((struct microcode_header_amd *)mc_amd->mpb)->patch_id); + *offset += mpbuf->len + SECTION_HDR_SIZE; + 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 Thu Jul 31 17:45:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQN-0008Uu-9y; Thu, 31 Jul 2014 17:45:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQL-0008UV-Oa for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:53 +0000 Received: from [85.158.143.35:33712] by server-3.bemta-4.messagelabs.com id D5/7B-06192-1D08AD35; Thu, 31 Jul 2014 17:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1406828751!12733370!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15328 invoked from network); 31 Jul 2014 17:45:52 -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; 31 Jul 2014 17:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQJ-0000Q2-DO for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuQJ-0002UG-BQ for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:51 +0000 Date: Thu, 31 Jul 2014 17:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1ac4cf52e38386bac7ac3440c7da0099662ca5c Author: Andrew Cooper AuthorDate: Tue Jul 29 17:02:25 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 17:02:25 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 0741696..5156df3 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -250,14 +250,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; cpuid_count(0x00000007, 0, &dummy, &ebx, &dummy, &dummy); c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - - early_intel_workaround(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 Thu Jul 31 17:45:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 31 Jul 2014 17:45: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 1XCuQN-0008Uu-9y; Thu, 31 Jul 2014 17:45:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQL-0008UV-Oa for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:53 +0000 Received: from [85.158.143.35:33712] by server-3.bemta-4.messagelabs.com id D5/7B-06192-1D08AD35; Thu, 31 Jul 2014 17:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1406828751!12733370!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15328 invoked from network); 31 Jul 2014 17:45:52 -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; 31 Jul 2014 17:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCuQJ-0000Q2-DO for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XCuQJ-0002UG-BQ for xen-changelog@lists.xensource.com; Thu, 31 Jul 2014 17:45:51 +0000 Date: Thu, 31 Jul 2014 17:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1ac4cf52e38386bac7ac3440c7da0099662ca5c Author: Andrew Cooper AuthorDate: Tue Jul 29 17:02:25 2014 +0200 Commit: Jan Beulich CommitDate: Tue Jul 29 17:02:25 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 0741696..5156df3 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -250,14 +250,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; cpuid_count(0x00000007, 0, &dummy, &ebx, &dummy, &dummy); c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - - early_intel_workaround(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